|
|
|
@ -148,7 +148,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
|
|
|
|
|
super.onPause();
|
|
|
|
|
|
|
|
|
|
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this))
|
|
|
|
|
finish();
|
|
|
|
|
finishAndRemoveTask();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -162,7 +162,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
|
|
|
|
|
Log.i("User interaction");
|
|
|
|
|
|
|
|
|
|
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
|
|
|
|
|
finish();
|
|
|
|
|
finishAndRemoveTask();
|
|
|
|
|
startActivity(new Intent(this, ActivityMain.class));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -207,7 +207,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
|
|
|
|
|
private void checkAuthentication() {
|
|
|
|
|
if (!this.getClass().equals(ActivityMain.class) && Helper.shouldAuthenticate(this)) {
|
|
|
|
|
Intent intent = getIntent();
|
|
|
|
|
finish();
|
|
|
|
|
finishAndRemoveTask();
|
|
|
|
|
startActivity(
|
|
|
|
|
new Intent(this, ActivityMain.class)
|
|
|
|
|
.putExtra("intent", intent));
|
|
|
|
|