Optional color reset

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

@@ -306,6 +306,7 @@ public class FragmentAccount extends FragmentBase {
                 Bundle args = new Bundle();
                 args.putInt("color", btnColor.getColor());
                 args.putString("title", getString(R.string.title_color));
+                args.putBoolean("reset", true);
 
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);

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

@@ -37,13 +37,15 @@ public class FragmentDialogColor extends FragmentDialogBase {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
-        int color = getArguments().getInt("color");
+        Bundle args = getArguments();
-        String title = getArguments().getString("title");
+        int color = args.getInt("color");
+        String title = args.getString("title");
+        boolean reset = args.getBoolean("reset", false);
 
         if (color == Color.TRANSPARENT)
             color = Color.BLUE;
 
-        return ColorPickerDialogBuilder
+        ColorPickerDialogBuilder builder = ColorPickerDialogBuilder
                 .with(getContext())
                 .setTitle(title)
                 .initialColor(color)
@@ -56,14 +58,17 @@ public class FragmentDialogColor extends FragmentDialogBase {
                         getArguments().putInt("color", selectedColor);
                         sendResult(RESULT_OK);
                     }
-                })
+                });
-                .setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
+
-                    @Override
+        if (reset)
-                    public void onClick(DialogInterface dialog, int which) {
+            builder.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
-                        getArguments().putInt("color", Color.TRANSPARENT);
+                @Override
-                        sendResult(RESULT_OK);
+                public void onClick(DialogInterface dialog, int which) {
-                    }
+                    getArguments().putInt("color", Color.TRANSPARENT);
-                })
+                    sendResult(RESULT_OK);
-                .build();
+                }
+            });
+
+        return builder.build();
     }
 }

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

@@ -289,6 +289,7 @@ public class FragmentIdentity extends FragmentBase {
                 Bundle args = new Bundle();
                 args.putInt("color", btnColor.getColor());
                 args.putString("title", getString(R.string.title_color));
+                args.putBoolean("reset", true);
 
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);

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

@@ -135,6 +135,7 @@ public class FragmentPop extends FragmentBase {
                 Bundle args = new Bundle();
                 args.putInt("color", btnColor.getColor());
                 args.putString("title", getString(R.string.title_color));
+                args.putBoolean("reset", true);
 
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);

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

@@ -369,6 +369,7 @@ public class FragmentRule extends FragmentBase {
                 Bundle args = new Bundle();
                 args.putInt("color", btnColor.getColor());
                 args.putString("title", getString(R.string.title_flag_color));
+                args.putBoolean("reset", true);
 
                 FragmentDialogColor fragment = new FragmentDialogColor();
                 fragment.setArguments(args);