Fix service terms refusal issue (fix #1271)

Signed-off-by: Daniele Ricci <[email protected]>
kontalk · Mar 17, 2020 · 62cf389 · 62cf389
1 parent a1481bd
commit 62cf389
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/app/src/main/java/org/kontalk/ui/NumberValidation.java b/app/src/main/java/org/kontalk/ui/NumberValidation.java
@@ -1255,11 +1255,8 @@ public void onAcceptTermsConfirmed(String network) {
     }
 
     public void onAcceptTermsCancel() {
-        abort();
-    }
-
-    public void onAcceptTermsDismiss() {
         mWaitingAcceptTerms = false;
+        abort();
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
@@ -1393,16 +1390,16 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
                         }
                     }
                 })
-                .dismissListener(new OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        ((NumberValidation) getActivity())
-                            .onAcceptTermsDismiss();
-                    }
-                })
                 .build();
         }
 
+        @Override
+        public void onCancel(@NonNull DialogInterface dialog) {
+            super.onCancel(dialog);
+            ((NumberValidation) getActivity())
+                .onAcceptTermsCancel();
+        }
+
         public static AcceptTermsDialogFragment newInstance(String network, String termsUrl) {
             AcceptTermsDialogFragment f = new AcceptTermsDialogFragment();
             Bundle args = new Bundle();