From 948eb6f5f2fc7a1e01210cd81c1c4e280fd026f4 Mon Sep 17 00:00:00 2001
From: Keith Irwin <mail@keithirwin.us>
Date: Tue, 25 Apr 2017 01:46:11 -0400
Subject: [PATCH] #8 Fixed how it was logging out after changing settings

---
 .../us/keithirwin/tracman/LoginActivity.java  | 27 ++++++++++++++++++
 .../keithirwin/tracman/SettingsActivity.java  | 28 ++-----------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
index b223e62..3c35e7a 100644
--- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java
@@ -128,6 +128,33 @@ public class LoginActivity extends AppCompatActivity implements
 
 	}
 
+	/**
+	 * if onResume() is called, the user has returned from SettingsActivity.
+	 * Their user account must be disassociated and the LocationService must be stopped.
+	 */
+	@Override
+	public void onResume() {
+		super.onResume();
+
+		// Get sharedPrefs
+		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+		SharedPreferences.Editor editor = sharedPref.edit();
+
+		// Stop LocationService
+		Log.v(TAG, "Stopping location service...");
+		stopService(new Intent(LoginActivity.this, LocationService.class));
+		editor.putBoolean("gps_switch",false);
+
+		// Remove saved loggedInUser
+		Log.v(TAG, "Removing saved user...");
+		editor.remove("loggedInUser");
+		editor.remove("loggedInUserId");
+		editor.remove("loggedInUserName");
+		editor.remove("loggedInUserSk");
+		editor.apply();
+
+	}
+
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
diff --git a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
index afbaa2f..8f0f02d 100644
--- a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
+++ b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java
@@ -205,35 +205,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
 		loadHeadersFromResource(R.xml.pref_headers, target);
 	}
 
-	public void signOut() {
-		Log.v(TAG, "signOut() called");
-
-		// Get sharedPrefs
-		SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-		SharedPreferences.Editor editor = sharedPref.edit();
-
-		// Stop LocationService
-		Log.v(TAG, "Stopping location service...");
-		stopService(new Intent(SettingsActivity.this, LocationService.class));
-		editor.putBoolean("gps_switch",false);
-
-		// Remove saved loggedInUser
-		Log.v(TAG, "Removing saved user...");
-		editor.remove("loggedInUser");
-		editor.remove("loggedInUserId");
-		editor.remove("loggedInUserName");
-		editor.remove("loggedInUserSk");
-		editor.commit();
+	@Override
+	public void onBackPressed() {
+		Log.v(TAG,"onBackPressed() called");
 
 		// Return to LoginActivity and don't sign back in again
 		setResult(SIGN_OUT, new Intent());
-	}
 
-	@Override
-	public void onBackPressed() {
-		if (true) {
-			signOut();
-		}
 		super.onBackPressed();
 	}