From b7ec6803dda5d30210c81dc2193e51f00a8082e5 Mon Sep 17 00:00:00 2001
From: downthecrop <bryce@mathx.ca>
Date: Mon, 28 Feb 2022 10:42:48 -0800
Subject: [PATCH] Add a button to save username and password (sometimes it
 wouldn't stick)

---
 .../net/kdt/pojavlaunch/SettingsActivity.java | 21 +++++++++++++++----
 .../src/main/res/layout/settings_menu.xml     | 12 +++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java b/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
index cfa8dc227..8854cefe1 100644
--- a/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
+++ b/app_2009scape/src/main/java/net/kdt/pojavlaunch/SettingsActivity.java
@@ -91,6 +91,11 @@ public class SettingsActivity extends Activity {
         final SwitchMaterial righthanded = findViewById(R.id.righthanded);
         final SeekBar mouseSpeed = findViewById(R.id.mouseslider);
         final Button loadConfig = findViewById(R.id.loadconfig);
+        final Button saveLogin = findViewById(R.id.savelogin);
+
+        //For storing string value in sharedPreference
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = preferences.edit();
 
         loadConfig.setOnTouchListener((v, event) -> {
             if (event.getAction() == MotionEvent.ACTION_DOWN) {
@@ -100,9 +105,17 @@ public class SettingsActivity extends Activity {
             return false;
         });
 
-        //For storing string value in sharedPreference
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        SharedPreferences.Editor editor = preferences.edit();
+        saveLogin.setOnTouchListener((v, event) -> {
+            if (event.getAction() == MotionEvent.ACTION_DOWN) {
+                editor.putString("password",password.getText().toString());
+                editor.putString("username",username.getText().toString());
+                editor.commit();
+                Toast.makeText(this, "Saved login data. Please restart the app.",
+                        Toast.LENGTH_SHORT).show();
+                return true;
+            }
+            return false;
+        });
 
         // Restore from saved values
         username.setText(preferences.getString("username",""));
@@ -125,6 +138,7 @@ public class SettingsActivity extends Activity {
                 System.out.println("Password: "+password.getText());
                 editor.putString("password",password.getText().toString());
                 editor.commit();
+                return true;
             }
             return false;
         });
@@ -135,7 +149,6 @@ public class SettingsActivity extends Activity {
                 editor.putInt("mousespeed",mouseSpeed.getProgress());
                 editor.commit();
                 LauncherPreferences.PREF_MOUSESPEED = mouseSpeed.getProgress();
-
             }
 
             @Override
diff --git a/app_2009scape/src/main/res/layout/settings_menu.xml b/app_2009scape/src/main/res/layout/settings_menu.xml
index 0810e0875..4b4920788 100644
--- a/app_2009scape/src/main/res/layout/settings_menu.xml
+++ b/app_2009scape/src/main/res/layout/settings_menu.xml
@@ -45,6 +45,17 @@
             app:layout_constraintTop_toBottomOf="@+id/username"
             tools:layout_editor_absoluteX="-1dp" />
 
+        <Button
+            android:id="@+id/savelogin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:text="Save Username &amp; Password"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/righthanded" />
+
         <TextView
             android:id="@+id/mousespeed_text"
             android:layout_width="match_parent"
@@ -89,5 +100,6 @@
             android:text="Load Config"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/righthanded" />
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file