From d7d5673b575b66b7580d03ad27e5b13516099610 Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Tue, 30 Jul 2024 14:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E5=89=8D=E5=85=88=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E6=97=B6?=
 =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E4=B8=BB=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B2=A1=E6=9C=89=E8=8E=B7=E5=8F=96=E5=88=B0=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xypower/mpremote/SettingsActivity.java    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/xypower/mpremote/SettingsActivity.java b/app/src/main/java/com/xypower/mpremote/SettingsActivity.java
index 3a623c2..2efb471 100644
--- a/app/src/main/java/com/xypower/mpremote/SettingsActivity.java
+++ b/app/src/main/java/com/xypower/mpremote/SettingsActivity.java
@@ -54,20 +54,14 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
-        SharedPreferences preferences = getSharedPreferences("mpremote", MODE_PRIVATE);
-
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putString("password", binding.editViewPassword.getText().toString());
-        editor.putBoolean("usingGateway", binding.gatewayIp.isChecked());
-        editor.putString("assignedIp", binding.ip.getText().toString());
-        editor.commit();
+        saveSettings();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
+                saveSettings();
                 setResult(0);
                 finish();
                 return false;
@@ -75,4 +69,14 @@ public class SettingsActivity extends AppCompatActivity {
                 return super.onOptionsItemSelected(item);
         }
     }
+
+    protected void saveSettings() {
+        SharedPreferences preferences = getSharedPreferences("mpremote", MODE_PRIVATE);
+
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putString("password", binding.editViewPassword.getText().toString());
+        editor.putBoolean("usingGateway", binding.gatewayIp.isChecked());
+        editor.putString("assignedIp", binding.ip.getText().toString());
+        editor.commit();
+    }
 }
\ No newline at end of file