Fixed next on close timing

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -280,20 +280,22 @@ public class FragmentMessages extends FragmentBase {
         rvMessage.setAdapter(adapter);
 
         if (viewType == AdapterMessage.ViewType.THREAD) {
-            ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
+            if (actionbar) {
-            model.observePrevNext(getViewLifecycleOwner(), thread, new ViewModelMessages.IPrevNext() {
+                ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
-                @Override
+                model.observePrevNext(getViewLifecycleOwner(), thread, new ViewModelMessages.IPrevNext() {
-                public void onPrevious(Long id) {
+                    @Override
-                    bottom_navigation.getMenu().findItem(R.id.action_prev).setIntent(new Intent().putExtra("id", id));
+                    public void onPrevious(boolean exists, Long id) {
-                    bottom_navigation.getMenu().findItem(R.id.action_prev).setEnabled(id != null);
+                        bottom_navigation.getMenu().findItem(R.id.action_prev).setIntent(new Intent().putExtra("id", id));
-                }
+                        bottom_navigation.getMenu().findItem(R.id.action_prev).setEnabled(id != null);
+                    }
 
-                @Override
+                    @Override
-                public void onNext(Long id) {
+                    public void onNext(boolean exists, Long id) {
-                    bottom_navigation.getMenu().findItem(R.id.action_next).setIntent(new Intent().putExtra("id", id));
+                        bottom_navigation.getMenu().findItem(R.id.action_next).setIntent(new Intent().putExtra("id", id));
-                    bottom_navigation.getMenu().findItem(R.id.action_next).setEnabled(id != null);
+                        bottom_navigation.getMenu().findItem(R.id.action_next).setEnabled(id != null);
-                }
+                    }
-            });
+                });
+            }
         } else {
             final SelectionPredicateMessage predicate = new SelectionPredicateMessage(rvMessage);
 
@@ -2069,12 +2071,21 @@ public class FragmentMessages extends FragmentBase {
         if (autoclose)
             finish();
         else if (autonext) {
-            Intent intent = bottom_navigation.getMenu().findItem(R.id.action_next).getIntent();
+            ViewModelMessages model = ViewModelProviders.of(getActivity()).get(ViewModelMessages.class);
-            Long id = (intent == null ? null : intent.getLongExtra("id", -1));
+            model.observePrevNext(getViewLifecycleOwner(), thread, new ViewModelMessages.IPrevNext() {
-            if (id == null || id < 0)
+                @Override
-                finish();
+                public void onPrevious(boolean exists, Long id) {
-            else
+                    // Do nothing
-                navigate(id);
+                }
+
+                @Override
+                public void onNext(boolean exists, Long id) {
+                    if (id != null)
+                        navigate(id);
+                    if (!exists)
+                        finish();
+                }
+            });
         }
     }
 

app/src/main/java/eu/faircode/email/ViewModelMessages.java

@@ -91,19 +91,17 @@ public class ViewModelMessages extends ViewModel {
                             TupleMessageEx next = list.get(pos - 1);
                             if (next == null)
                                 load = true;
-                            else
+                            intf.onNext(true, next == null ? null : next.id);
-                                intf.onNext(next.id);
                         } else
-                            intf.onNext(null);
+                            intf.onNext(false, null);
 
                         if (pos + 1 < list.size()) {
                             TupleMessageEx prev = list.get(pos + 1);
                             if (prev == null)
                                 load = true;
-                            else
+                            intf.onPrevious(true, prev == null ? null : prev.id);
-                                intf.onPrevious(prev.id);
                         } else
-                            intf.onPrevious(null);
+                            intf.onPrevious(false, null);
 
                         if (load)
                             list.loadAround(pos);
@@ -116,8 +114,8 @@ public class ViewModelMessages extends ViewModel {
     }
 
     interface IPrevNext {
-        void onPrevious(Long id);
+        void onPrevious(boolean exists, Long id);
 
-        void onNext(Long id);
+        void onNext(boolean exists, Long id);
     }
 }