From b25f57c35d81757b1ea943c1ec3c3c888e47eced Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Fri, 21 Apr 2017 21:15:55 -0400 Subject: [PATCH] #8 Switched finish() to onBackButtonPushed() --- .../java/us/keithirwin/tracman/SettingsActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java index 74b74df..f5bcd6c 100644 --- a/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java +++ b/app/src/main/java/us/keithirwin/tracman/SettingsActivity.java @@ -207,11 +207,13 @@ public class SettingsActivity extends AppCompatPreferenceActivity { public void onBackPressed() { // super.onBackPressed(); - // Return to LoginActivity and don't sign back in again + // Return to LoginActivity and don't sign back in again Intent signOutIntent = new Intent(); signOutIntent.putExtra("method","signOut"); - setResult(RESULT_OK, signOutIntent); - finish(); + setResult(RESULT_OK, signOutIntent); + + super.onBackPressed(); +// finish(); } @@ -254,7 +256,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { bindPreferenceSummaryToValue(findPreference("broadcast_frequency")); bindPreferenceSummaryToValue(findPreference("broadcast_priority")); - } + } } /**