From 4b1da12f81321efb009e75ddc69a2636d392f087 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 1 Jul 2019 14:43:52 +0200
Subject: [PATCH] Simplification

---
 .../faircode/email/FragmentDialogDuration.java  | 17 +++++++++--------
 .../eu/faircode/email/FragmentDialogFolder.java | 15 ++++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index b53fdeb812..4c50d95498 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -120,27 +120,28 @@ public class FragmentDialogDuration extends DialogFragment {
                         if (duration < 0)
                             duration = 0;
                         Log.i("Set duration=" + duration + " time=" + new Date(cal.getTimeInMillis()));
-                        sendResult(RESULT_OK, duration, cal.getTimeInMillis());
+
+                        Bundle args = getArguments();
+                        args.putLong("duration", duration);
+                        args.putLong("time", cal.getTimeInMillis());
+
+                        sendResult(RESULT_OK);
                     }
                 })
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialogInterface) {
-                        sendResult(RESULT_CANCELED, 0, 0);
+                        sendResult(RESULT_CANCELED);
                     }
                 })
                 .create();
     }
 
-    private void sendResult(int result, long duration, long time) {
-        Bundle args = getArguments();
-        args.putLong("duration", duration);
-        args.putLong("time", time);
-
+    private void sendResult(int result) {
         Fragment target = getTargetFragment();
         if (target != null) {
             Intent data = new Intent();
-            data.putExtra("args", args);
+            data.putExtra("args", getArguments());
             target.onActivityResult(getTargetRequestCode(), result, data);
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
index 5f80291202..539f505af9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
@@ -82,7 +82,11 @@ public class FragmentDialogFolder extends DialogFragment {
                     @Override
                     public void onFolderSelected(TupleFolderEx folder) {
                         dismiss();
-                        sendResult(RESULT_OK, folder.id);
+
+                        Bundle args = getArguments();
+                        args.putLong("folder", folder.id);
+
+                        sendResult(RESULT_OK);
                     }
                 });
 
@@ -107,20 +111,17 @@ public class FragmentDialogFolder extends DialogFragment {
                 .setOnDismissListener(new DialogInterface.OnDismissListener() {
                     @Override
                     public void onDismiss(DialogInterface dialogInterface) {
-                        sendResult(RESULT_CANCELED, -1);
+                        sendResult(RESULT_CANCELED);
                     }
                 })
                 .create();
     }
 
-    private void sendResult(int result, long folder) {
-        Bundle args = getArguments();
-        args.putLong("folder", folder);
-
+    private void sendResult(int result) {
         Fragment target = getTargetFragment();
         if (target != null) {
             Intent data = new Intent();
-            data.putExtra("args", args);
+            data.putExtra("args", getArguments());
             target.onActivityResult(getTargetRequestCode(), result, data);
         }
     }