From df90263f41972b29e85f31db8b008e2e881e2661 Mon Sep 17 00:00:00 2001 From: preyearegmi Date: Fri, 8 Mar 2019 10:18:29 +0900 Subject: [PATCH] Before checking logout feature for all api call --- .../base/BaseActivity.java | 29 ++++++++++--------- .../homeV2/view/HomeActivityV2.java | 5 ++-- .../recipientadd/RecipientAddV2Presenter.java | 1 + .../RecipientListingV2Presenter.java | 5 ++-- .../splash_screen/view/SplashScreen.java | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java index d149f008..7e05a036 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/base/BaseActivity.java @@ -3,12 +3,11 @@ package com.gmeremit.online.gmeremittance_native.base; import android.app.Activity; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.support.annotation.Nullable; -import android.content.Intent; import android.support.v4.app.FragmentManager; -import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; @@ -18,8 +17,7 @@ import android.widget.Toast; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomAlertDialog; import com.gmeremit.online.gmeremittance_native.customwidgets.CustomProgressDialog; -import com.gmeremit.online.gmeremittance_native.homeV2.view.HomeActivityV2; -import com.gmeremit.online.gmeremittance_native.splash_screen.view.SplashScreen; +import com.google.gson.annotations.Since; public class BaseActivity extends AppCompatActivity implements BaseContractInterface { @@ -27,12 +25,12 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter private boolean isProgressBarShowing; private CustomAlertDialog customAlertDialog; - private boolean shouldEnableAppScreenShot=false; + private boolean shouldEnableAppScreenShot = false; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if(!shouldEnableAppScreenShot) { + if (!shouldEnableAppScreenShot) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE); } } @@ -64,9 +62,8 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter } - protected void enableAppToTakeScreenShot(boolean action) - { - this.shouldEnableAppScreenShot=action; + protected void enableAppToTakeScreenShot(boolean action) { + this.shouldEnableAppScreenShot = action; } @Override @@ -84,9 +81,7 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter customAlertDialog.show(fragmentManager, "CustomerMessage" + alertType.toString()); - } - catch (Exception e) - { + } catch (Exception e) { } @@ -130,8 +125,14 @@ public class BaseActivity extends AppCompatActivity implements BaseContractInter @Override public void logout() { -// Intent intent=new Intent(getApplicationContext(), SplashScreen.class); -// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + /* + Since we have a child process forked at native level for anti debugging mechanism, restarting + app this way may cause unusual behavior with child process. So we kill the app process directly and restart. + */ + +//TODO Cannot restart this way in conjunction with anti debugging. +// Intent intent=new Intent(HomeActivityV2.this, SplashScreen.class); +// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); // startActivity(intent); PackageManager packageManager = getPackageManager(); diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index 96dd0759..0e0d349b 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -383,9 +383,8 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra @Override public void performLogout() { presenter.clearAllData(); - Intent intent=new Intent(HomeActivityV2.this, SplashScreen.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); - startActivity(intent); + + logout(); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java index 9e55449c..49790d99 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientadd/RecipientAddV2Presenter.java @@ -248,6 +248,7 @@ public class RecipientAddV2Presenter extends BasePresenter implements RecipientA @Override protected void unauthorizedAccess(String message) { + gateway.clearAllUserData(); view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java index 3a4debd3..fca12a41 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/recipientV2/presenter/recipientlisting/RecipientListingV2Presenter.java @@ -52,6 +52,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi .observeOn(AndroidSchedulers.mainThread()) .subscribeWith(new RecipinetListObserver()) ); + } @Override @@ -106,7 +107,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi @Override protected void unauthorizedAccess(String message) { - gateway.clearAllUserData(); + RecipientListingV2Presenter.this.gateway.clearAllUserData(); view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); } @@ -141,7 +142,7 @@ public class RecipientListingV2Presenter extends BasePresenter implements Recipi @Override protected void unauthorizedAccess(String message) { - gateway.clearAllUserData(); + RecipientListingV2Presenter.this.gateway.clearAllUserData(); view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT,alertType -> view.logout()); } diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index fd697080..7a637029 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -153,7 +153,7 @@ public class SplashScreen extends BaseActivity { @Override protected void onResume() { super.onResume(); - //startAntiDebugger(); + startAntiDebugger(); if(!hasRootAccess()&&checkIfAppSafe()) { if (persistenceStorageManager.getLoggedin() != null && persistenceStorageManager.getLoggedin().equals("HOME")) {