From 971c2d1cd48492d6646943eb5e1680024e7c7316 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 7 Jan 2020 08:51:30 +0100
Subject: [PATCH] Simplified error reporting / review requests

---
 .../eu/faircode/email/FragmentMessages.java   | 34 ++++++++-----------
 .../res/layout/dialog_error_reporting.xml     | 10 ------
 app/src/main/res/layout/dialog_review.xml     | 10 ------
 3 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 788bde777c..9caeb5e261 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5518,7 +5518,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_error_reporting, null);
             Button btnInfo = dview.findViewById(R.id.btnInfo);
-            CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
             btnInfo.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -5527,14 +5526,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                 }
             });
 
-            cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-                    prefs.edit().putBoolean("crash_reports_asked", isChecked).apply();
-                }
-            });
-
             return new AlertDialog.Builder(getContext())
                     .setView(dview)
                     .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@@ -5545,7 +5536,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             Log.setCrashReporting(true);
                         }
                     })
-                    .setNegativeButton(android.R.string.no, null)
+                    .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                            prefs.edit().putBoolean("crash_reports_asked", true).apply();
+                        }
+                    })
                     .create();
         }
     }
@@ -5555,15 +5552,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
             View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_review, null);
-            CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
-
-            cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                @Override
-                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-                    prefs.edit().putBoolean("review_asked", isChecked).apply();
-                }
-            });
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)
@@ -5575,7 +5563,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             startActivity(Helper.getIntentRate(getContext()));
                         }
                     })
-                    .setNegativeButton(android.R.string.no, null)
+                    .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                            prefs.edit().putBoolean("review_asked", true).apply();
+                        }
+                    })
                     .setNeutralButton(R.string.title_later, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
diff --git a/app/src/main/res/layout/dialog_error_reporting.xml b/app/src/main/res/layout/dialog_error_reporting.xml
index 36da32250e..c31cf2c6aa 100644
--- a/app/src/main/res/layout/dialog_error_reporting.xml
+++ b/app/src/main/res/layout/dialog_error_reporting.xml
@@ -52,15 +52,5 @@
             app:layout_constraintStart_toEndOf="@id/btnInfo"
             app:layout_constraintTop_toTopOf="@id/btnInfo"
             app:srcCompat="@drawable/baseline_open_in_new_24" />
-
-        <CheckBox
-            android:id="@+id/cbNotAgain"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_no_ask_again"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btnInfo" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_review.xml b/app/src/main/res/layout/dialog_review.xml
index e8c58f00eb..1608aa3bc2 100644
--- a/app/src/main/res/layout/dialog_review.xml
+++ b/app/src/main/res/layout/dialog_review.xml
@@ -30,15 +30,5 @@
             android:textColor="?android:attr/textColorPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
-
-        <CheckBox
-            android:id="@+id/cbNotAgain"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/title_no_ask_again"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvExplanation" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file