Refactoring

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

@@ -1083,7 +1083,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
         return intent;
     }
 
-    public static class FragmentDialogPassword extends DialogFragmentEx {
+    public static class FragmentDialogPassword extends FragmentDialogEx {
         private TextInputLayout etPassword1;
         private TextInputLayout etPassword2;
 

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

@@ -1130,7 +1130,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         return intent;
     }
 
-    public static class FragmentDialogFirst extends DialogFragmentEx {
+    public static class FragmentDialogFirst extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -1147,7 +1147,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         }
     }
 
-    public static class FragmentDialogRate extends DialogFragmentEx {
+    public static class FragmentDialogRate extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -3425,7 +3425,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         void finish();
     }
 
-    public static class FragmentDialogLink extends DialogFragmentEx {
+    public static class FragmentDialogLink extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3602,7 +3602,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogImage extends DialogFragmentEx {
+    public static class FragmentDialogImage extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3634,7 +3634,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogFull extends DialogFragmentEx {
+    public static class FragmentDialogFull extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3668,7 +3668,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentDialogWebView extends DialogFragmentEx {
+    public static class FragmentDialogWebView extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3833,7 +3833,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentKeywordManage extends DialogFragmentEx {
+    public static class FragmentKeywordManage extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3928,7 +3928,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
     }
 
-    public static class FragmentKeywordAdd extends DialogFragmentEx {
+    public static class FragmentKeywordAdd extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -260,7 +260,7 @@ public class FragmentAnswer extends FragmentBase {
         }.execute(FragmentAnswer.this, args, "answer:delete");
     }
 
-    public static class FragmentInfo extends DialogFragmentEx {
+    public static class FragmentInfo extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -3284,7 +3284,7 @@ public class FragmentCompose extends FragmentBase {
         }
     };
 
-    public static class FragmentDialogContactGroup extends DialogFragmentEx {
+    public static class FragmentDialogContactGroup extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3338,7 +3338,7 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogAnswer extends DialogFragmentEx {
+    public static class FragmentDialogAnswer extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -3382,7 +3382,7 @@ public class FragmentCompose extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogLink extends DialogFragmentEx {
+    public static class FragmentDialogLink extends FragmentDialogEx {
         private EditText etLink;
 
         @Override

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

@@ -180,7 +180,7 @@ public class FragmentContacts extends FragmentBase {
         return intent;
     }
 
-    public static class FragmentDelete extends DialogFragmentEx {
+    public static class FragmentDelete extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -34,7 +34,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.PreferenceManager;
 
-public class FragmentDialogAsk extends DialogFragmentEx {
+public class FragmentDialogAsk extends FragmentDialogEx {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -40,7 +40,7 @@ import java.util.Date;
 
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentDialogDuration extends DialogFragmentEx {
+public class FragmentDialogDuration extends FragmentDialogEx {
     private Calendar cal = Calendar.getInstance();
 
     @Override

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

@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment;
 
 import static android.app.Activity.RESULT_CANCELED;
 
-public class DialogFragmentEx extends DialogFragment {
+public class FragmentDialogEx extends DialogFragment {
     private boolean once = false;
 
     @Override

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

@@ -36,7 +36,7 @@ import java.util.List;
 
 import static android.app.Activity.RESULT_OK;
 
-public class FragmentDialogFolder extends DialogFragmentEx {
+public class FragmentDialogFolder extends FragmentDialogEx {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -17,7 +17,7 @@ import java.io.InputStream;
 
 import io.noties.markwon.Markwon;
 
-public class FragmentDialogMarkdown extends DialogFragmentEx {
+public class FragmentDialogMarkdown extends FragmentDialogEx {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -1094,7 +1094,7 @@ public class FragmentIdentity extends FragmentBase {
         etSignature.setTag(html);
     }
 
-    public static class FragmentDialogHtml extends DialogFragmentEx {
+    public static class FragmentDialogHtml extends FragmentDialogEx {
         private EditText etHtml;
 
         @Override

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

@@ -4470,7 +4470,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         };
     }
 
-    public static class FragmentDialogReporting extends DialogFragmentEx {
+    public static class FragmentDialogReporting extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4517,7 +4517,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
     }
 
-    public static class FragmentDialogAccount extends DialogFragmentEx {
+    public static class FragmentDialogAccount extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -4555,7 +4555,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
     }
 
-    public static class FragmentDialogError extends DialogFragmentEx {
+    public static class FragmentDialogError extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -142,7 +142,7 @@ public class FragmentOperations extends FragmentBase {
         return intent;
     }
 
-    public static class DialogDelete extends DialogFragmentEx {
+    public static class DialogDelete extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -354,7 +354,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swActionbar.setChecked(prefs.getBoolean("actionbar", true));
     }
 
-    public static class FragmentDialogTheme extends DialogFragmentEx {
+    public static class FragmentDialogTheme extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -289,7 +289,7 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
         return Helper.getTimeInstance(context, SimpleDateFormat.SHORT).format(cal.getTime());
     }
 
-    public static class TimePickerFragment extends DialogFragmentEx implements TimePickerDialog.OnTimeSetListener {
+    public static class TimePickerFragment extends FragmentDialogEx implements TimePickerDialog.OnTimeSetListener {
         @NonNull
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {

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

@@ -484,7 +484,7 @@ public class FragmentQuickSetup extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogDone extends DialogFragmentEx {
+    public static class FragmentDialogDone extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -871,7 +871,7 @@ public class FragmentRule extends FragmentBase {
         }
     }
 
-    public static class FragmentDialogCheck extends DialogFragmentEx {
+    public static class FragmentDialogCheck extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -365,7 +365,7 @@ public class FragmentSetup extends FragmentBase {
         btnPermissions.setEnabled(!has);
     }
 
-    public static class FragmentDialogDoze extends DialogFragmentEx {
+    public static class FragmentDialogDoze extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {

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

@@ -480,7 +480,7 @@ public class Helper {
         fragment.show(manager, "error:unexpected");
     }
 
-    public static class FragmentDialogUnexpected extends DialogFragmentEx {
+    public static class FragmentDialogUnexpected extends FragmentDialogEx {
         @NonNull
         @Override
         public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {