Simplification, cleanup

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

@@ -56,7 +56,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.documentfile.provider.DocumentFile;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;

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

@@ -49,7 +49,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.app.NotificationCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;

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

@@ -37,7 +37,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
-import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -267,10 +266,12 @@ public class FragmentAnswer extends FragmentBase {
                     getString(R.string.title_answer_template_email) +
                     "</p>");
 
-            View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_message, null);
+            View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null);
             TextView tvMessage = dview.findViewById(R.id.tvMessage);
+            CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
             tvMessage.setText(spanned);
+            cbNotAgain.setVisibility(View.GONE);
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)

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

@@ -33,6 +33,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -40,7 +41,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
 import androidx.constraintlayout.widget.Group;
-import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -184,10 +184,12 @@ public class FragmentContacts extends FragmentBase {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-            final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_message, null);
+            final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_ask_again, null);
             final TextView tvMessage = dview.findViewById(R.id.tvMessage);
+            CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
 
             tvMessage.setText(getText(R.string.title_delete_contacts));
+            cbNotAgain.setVisibility(View.GONE);
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)

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

@@ -38,7 +38,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.Group;
-import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

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

@@ -38,7 +38,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
-import androidx.fragment.app.DialogFragment;
 import androidx.preference.PreferenceManager;
 
 public class FragmentOptionsDisplay extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {

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

@@ -51,7 +51,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
-import androidx.fragment.app.DialogFragment;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

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

@@ -45,7 +45,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
-import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.Observer;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;

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

@@ -58,7 +58,6 @@ import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.exifinterface.media.ExifInterface;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

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

@@ -102,7 +102,7 @@ public class ZoomableImageView extends ImageView {
         float width = getMeasuredWidth();
         float height = getMeasuredHeight();
         //Fit to screen.
-        float scale = width > height ? height / bmHeight :  width / bmWidth;
+        float scale = width > height ? height / bmHeight : width / bmWidth;
 
         matrix.setScale(scale, scale);
         saveScale = 1f;
@@ -162,8 +162,7 @@ public class ZoomableImageView extends ImageView {
                     //limit left and right movement
                     if (scaleWidth < getWidth() && scaleHeight < getHeight()) {
                         // don't do anything
-                    }
+                    } else if (scaleWidth < getWidth()) {
-                    else if (scaleWidth < getWidth()) {
                         deltaX = 0;
                         limitY = true;
                     }
@@ -184,7 +183,7 @@ public class ZoomableImageView extends ImageView {
                     if (limitY) {
                         if (y + deltaY > 0) {
                             deltaY = -y;
-                        } else  if (y + deltaY < -bottom) {
+                        } else if (y + deltaY < -bottom) {
                             deltaY = -(y + bottom);
                         }
 

app/src/main/res/layout/dialog_message.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="24dp">
-
-        <TextView
-            android:id="@+id/tvMessage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Message"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</ScrollView>