From ac69a94dd2f1e5082a399300b19827ff379f7182 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 12 Sep 2019 13:23:32 +0200
Subject: [PATCH] Added dialog cancel

---
 app/src/main/java/eu/faircode/email/ActivityEML.java        | 1 +
 app/src/main/java/eu/faircode/email/ActivitySetup.java      | 1 +
 app/src/main/java/eu/faircode/email/ActivityView.java       | 1 +
 app/src/main/java/eu/faircode/email/AdapterMessage.java     | 6 +++++-
 app/src/main/java/eu/faircode/email/FragmentAnswer.java     | 1 +
 app/src/main/java/eu/faircode/email/FragmentCompose.java    | 4 ++++
 .../main/java/eu/faircode/email/FragmentDialogDuration.java | 1 +
 .../main/java/eu/faircode/email/FragmentDialogFolder.java   | 1 +
 app/src/main/java/eu/faircode/email/FragmentIdentity.java   | 1 +
 app/src/main/java/eu/faircode/email/FragmentMessages.java   | 1 +
 .../main/java/eu/faircode/email/FragmentOptionsDisplay.java | 1 +
 app/src/main/java/eu/faircode/email/FragmentQuickSetup.java | 1 +
 app/src/main/java/eu/faircode/email/FragmentRule.java       | 1 +
 app/src/main/java/eu/faircode/email/FragmentSetup.java      | 1 +
 14 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java
index 05ae76c926..36680661f1 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEML.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEML.java
@@ -277,6 +277,7 @@ public class ActivityEML extends ActivityBase {
                                 }.execute(ActivityEML.this, args, "eml:store");
                             }
                         })
+                        .setNegativeButton(android.R.string.cancel, null)
                         .show();
             }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java
index 7ca5d6d217..043036bb32 100644
--- a/app/src/main/java/eu/faircode/email/ActivitySetup.java
+++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java
@@ -1103,6 +1103,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
                             }
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 9d2e1c54c8..1ebdb3984d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -1132,6 +1132,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                             prefs.edit().putBoolean("first", false).apply();
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5d91276e20..26663ebf8d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3881,6 +3881,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
@@ -4140,6 +4141,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             fragment.show(getFragmentManager(), "keyword:add");
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
@@ -4192,7 +4194,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                 }.execute(FragmentKeywordAdd.this, args, "message:keyword:add");
                             }
                         }
-                    }).create();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
         }
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index bcbf1b77b9..1aba043dbf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -284,6 +284,7 @@ public class FragmentAnswer extends FragmentBase {
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index ada5b80058..8525c64fff 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3435,6 +3435,7 @@ public class FragmentCompose extends FragmentBase {
 
             final AlertDialog dialog = new AlertDialog.Builder(getContext())
                     .setView(dview)
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
 
             lvGroup.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -3498,6 +3499,7 @@ public class FragmentCompose extends FragmentBase {
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
@@ -3550,6 +3552,7 @@ public class FragmentCompose extends FragmentBase {
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
@@ -3690,6 +3693,7 @@ public class FragmentCompose extends FragmentBase {
                             sendResult(Activity.RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index 44ca93b658..a163af95cb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -101,6 +101,7 @@ public class FragmentDialogDuration extends FragmentDialogBase {
                         sendResult(RESULT_OK);
                     }
                 })
+                .setNegativeButton(android.R.string.cancel, null)
                 .setNeutralButton(R.string.title_reset, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index 12b9c5361d..cf3079b443 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -111,6 +111,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
         return new AlertDialog.Builder(getContext())
                 .setTitle(title)
                 .setView(dview)
+                .setNegativeButton(android.R.string.cancel, null)
                 .create();
     }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 0f9f5b17f6..d2386019bf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -1176,6 +1176,7 @@ public class FragmentIdentity extends FragmentBase {
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 610ea06b13..da64c37b4c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4715,6 +4715,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index d73aa5dec6..c23ab4e4a0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -488,6 +488,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
 
             return new AlertDialog.Builder(getContext())
                     .setView(dview)
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
index e7d4f671bd..a44de3f494 100644
--- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
@@ -511,6 +511,7 @@ public class FragmentQuickSetup extends FragmentBase {
                             sendResult(RESULT_OK);
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index dd090d36f1..ef09febc68 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -1098,6 +1098,7 @@ public class FragmentRule extends FragmentBase {
             return new AlertDialog.Builder(getContext())
                     .setTitle(R.string.title_rule_matched)
                     .setView(dview)
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 2b213022a9..6cd9bf25cf 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -429,6 +429,7 @@ public class FragmentSetup extends FragmentBase {
                             }
                         }
                     })
+                    .setNegativeButton(android.R.string.cancel, null)
                     .create();
         }
     }