From c9308e71ff3e0d75d4680725e7489fb5b2e2f49c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 13 Feb 2019 08:53:16 +0000
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/FragmentOptions.java    | 25 ++++++++++---------
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index 54ab23cb72..10d5485b16 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -82,8 +82,8 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
     private SwitchCompat swCollapse;
     private SwitchCompat swAutoRead;
     private SwitchCompat swAutoMove;
-    private SwitchCompat swSender;
     private SwitchCompat swAutoResize;
+    private SwitchCompat swSender;
     private SwitchCompat swAutoSend;
 
     private SwitchCompat swNotifyPreview;
@@ -104,11 +104,12 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             "enabled", "updates",
             "metered", "download",
             "unified", "date", "threading", "avatars", "identicons", "name_email", "preview", "addresses", "autoimages", "actionbar",
-            "pull", "swipenav", "autoexpand", "autoclose", "autonext", "collapse", "autoread", "automove", "sender", "autoresize", "autosend",
+            "pull", "swipenav", "autoexpand", "autoclose", "autonext", "collapse", "autoread", "automove",
+            "autoresize", "sender", "autosend",
             "notify_preview", "light", "sound",
             "debug",
             "first", "why", "last_update_check", "app_support", "message_swipe", "message_select", "folder_actions", "folder_sync",
-            "edit_ref_confirmed", "autosend", "automove", "show_html_confirmed", "show_images_confirmed"
+            "edit_ref_confirmed", "show_html_confirmed", "show_images_confirmed"
     };
 
     @Override
@@ -147,8 +148,8 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swCollapse = view.findViewById(R.id.swCollapse);
         swAutoRead = view.findViewById(R.id.swAutoRead);
         swAutoMove = view.findViewById(R.id.swAutoMove);
-        swSender = view.findViewById(R.id.swSender);
         swAutoResize = view.findViewById(R.id.swAutoResize);
+        swSender = view.findViewById(R.id.swSender);
         swAutoSend = view.findViewById(R.id.swAutoSend);
 
         swNotifyPreview = view.findViewById(R.id.swNotifyPreview);
@@ -362,13 +363,6 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             }
         });
 
-        swSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("sender", checked).apply();
-            }
-        });
-
         swAutoResize.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -376,6 +370,13 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
             }
         });
 
+        swSender.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("sender", checked).apply();
+            }
+        });
+
         swAutoSend.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -517,8 +518,8 @@ public class FragmentOptions extends FragmentBase implements SharedPreferences.O
         swCollapse.setChecked(prefs.getBoolean("collapse", false));
         swAutoRead.setChecked(prefs.getBoolean("autoread", false));
         swAutoMove.setChecked(!prefs.getBoolean("automove", false));
-        swSender.setChecked(prefs.getBoolean("sender", false));
         swAutoResize.setChecked(prefs.getBoolean("autoresize", true));
+        swSender.setChecked(prefs.getBoolean("sender", false));
         swAutoSend.setChecked(!prefs.getBoolean("autosend", false));
 
         swNotifyPreview.setChecked(prefs.getBoolean("notify_preview", true));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 79cbbae05f..343382ce41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,8 +171,8 @@
     <string name="title_advanced_collapse">Collapse messages in conversations on \'back\'</string>
     <string name="title_advanced_automove">Confirm moving messages</string>
     <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
-    <string name="title_advanced_sender">Allow editing sender address</string>
     <string name="title_advanced_autoresize">Automatically resize images for displaying on screens</string>
+    <string name="title_advanced_sender">Allow editing sender address</string>
     <string name="title_advanced_autosend">Confirm sending messages</string>
 
     <string name="title_advanced_updates">Check for updates</string>