Prevent ANR

Sentaroh · Mar 5, 2021 · 7bf535f · 7bf535f
1 parent 696cddd
commit 7bf535f
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 72 deletions.
diff --git a/SMBSync2/src/main/AndroidManifest.xml b/SMBSync2/src/main/AndroidManifest.xml
@@ -128,6 +128,7 @@
             android:name=".ActivityNotification"
             android:theme="@android:style/Theme.Translucent"
             android:launchMode="singleTop"
+            android:taskAffinity=".ActivityNotification"
             android:process=":Notify"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|layoutDirection|fontScale"
             android:screenOrientation="unspecified"

diff --git a/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/ActivityMain.java b/SMBSync2/src/main/java/com/sentaroh/android/SMBSync2/ActivityMain.java
@@ -455,7 +455,6 @@ protected void onPause() {
         super.onPause();
         mUtil.addDebugMsg(1, "I", CommonUtilities.getExecutedMethodName() + " entered " + ",currentView=" + mCurrentTab +
                 ", getChangingConfigurations=" + String.format("0x%08x", getChangingConfigurations()));
-        setActivityForeground(false);
         if (!isTaskTermination) saveTaskData();
         CommonUtilities.saveMsgList(mGp);//Save last updated message tab list
     }
@@ -464,6 +463,7 @@ protected void onPause() {
     protected void onStop() {
         super.onStop();
         mUtil.addDebugMsg(1, "I", CommonUtilities.getExecutedMethodName() + " entered");
+        setActivityForeground(false);
     }
 
     @Override
@@ -5272,6 +5272,7 @@ public void run() {
 
     private void openService(final NotifyEvent p_ntfy) {
         mUtil.addDebugMsg(1, "I", CommonUtilities.getExecutedMethodName() + " entered");
+        mGp.activityIsBackground=false;
         mSvcConnection = new ServiceConnection() {
             public void onServiceConnected(ComponentName arg0, IBinder service) {
                 mUtil.addDebugMsg(1, "I", CommonUtilities.getExecutedMethodName() + " entered");