From 32ba6ec14e6fc9b64241fee26209b42858bd74cf Mon Sep 17 00:00:00 2001 From: Negue Date: Sun, 13 Dec 2015 02:32:47 +0100 Subject: [PATCH] fix #187 --- .../android/habitica/HabiticaApplication.java | 11 +++++++++-- .../com/habitrpg/android/habitica/MainActivity.java | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java index c8b705c7e..1212e1673 100644 --- a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java +++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java @@ -151,10 +151,17 @@ public class HabiticaApplication extends Application { context.startActivity(intent); } - public static void checkUserAuthentication(Context context, HostConfig hostConfig) { + public static boolean checkUserAuthentication(Context context, HostConfig hostConfig) { if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) { - context.startActivity(new Intent(context, LoginActivity.class)); + Intent intent = new Intent(context, LoginActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); + + context.startActivity(intent); + + return false; } + + return true; } // endregion diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index 66c58d296..1b158bd15 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -129,7 +129,9 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb Fabric.with(this, crashlytics); this.hostConfig = PrefsActivity.fromContext(this); - HabiticaApplication.checkUserAuthentication(this, hostConfig); + if(!HabiticaApplication.checkUserAuthentication(this, hostConfig)) + return; + HabiticaApplication.ApiHelper = this.mAPIHelper = new APIHelper(this, hostConfig); new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);