From e65c3cfd5c810aef269bdfb3f4088b154b74fdee Mon Sep 17 00:00:00 2001 From: Sergey Eremin Date: Wed, 22 Feb 2017 17:39:37 +0300 Subject: [PATCH] Log out closes all activities now --- .../yeriomin/yalpstore/YalpStoreActivity.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreActivity.java index c703ea21f..43832300f 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/YalpStoreActivity.java @@ -10,12 +10,23 @@ import android.view.MenuItem; public abstract class YalpStoreActivity extends Activity { + static protected boolean logout = false; + @Override protected void onCreate(Bundle savedInstanceState) { + logout = false; ThemeManager.setTheme(this); super.onCreate(savedInstanceState); } + @Override + protected void onResume() { + super.onResume(); + if (logout) { + finish(); + } + } + @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.menu_main, menu); @@ -37,7 +48,7 @@ public abstract class YalpStoreActivity extends Activity { public void onClick(DialogInterface dialogInterface, int i) { new PlayStoreApiWrapper(getApplicationContext()).logout(); dialogInterface.dismiss(); - finish(); + finishAll(); } }) .setNegativeButton(android.R.string.cancel, null) @@ -55,4 +66,9 @@ public abstract class YalpStoreActivity extends Activity { } return super.onOptionsItemSelected(item); } + + protected void finishAll() { + logout = true; + finish(); + } }