@onekeyfe/react-native-lite-card 1.1.17 → 1.1.19

package/android/src/main/java/com/onekeyfe/reactnativelitecard/utils/Utils.java

@@ -270,11 +270,15 @@ public final class Utils {
         private int mConfigCount = 0;
 
         void addListener(final Object object, final OnAppStatusChangedListener listener) {
-            mStatusListenerMap.put(object, listener);
+            synchronized (mStatusListenerMap) {
+                mStatusListenerMap.put(object, listener);
+            }
         }
 
         void removeListener(final Object object) {
-            mStatusListenerMap.remove(object);
+            synchronized (mStatusListenerMap) {
+                mStatusListenerMap.remove(object);
+            }
         }
 
         @Override
@@ -324,22 +328,26 @@ public final class Utils {
 
         @Override
         public void onActivityDestroyed(Activity activity) {
-            mActivityList.remove(activity);
+            synchronized (mActivityList) {
+                mActivityList.remove(activity);
+            }
         }
 
         private void postStatus(final boolean isForeground) {
-            if (mStatusListenerMap.isEmpty()) {
-                return;
-            }
-            for (OnAppStatusChangedListener onAppStatusChangedListener :
-                    mStatusListenerMap.values()) {
-                if (onAppStatusChangedListener == null) {
+            synchronized (mStatusListenerMap) {
+                if (mStatusListenerMap.isEmpty()) {
                     return;
                 }
-                if (isForeground) {
-                    onAppStatusChangedListener.onForeground();
-                } else {
-                    onAppStatusChangedListener.onBackground();
+                for (OnAppStatusChangedListener onAppStatusChangedListener :
+                        mStatusListenerMap.values()) {
+                    if (onAppStatusChangedListener == null) {
+                        return;
+                    }
+                    if (isForeground) {
+                        onAppStatusChangedListener.onForeground();
+                    } else {
+                        onAppStatusChangedListener.onBackground();
+                    }
                 }
             }
         }
@@ -348,23 +356,30 @@ public final class Utils {
             if (activity == null || mActivityList == null) {
                 return;
             }
-            if (mActivityList.contains(activity)) {
-                Activity lastActivity = mActivityList.getLast();
-                if (lastActivity != null && !lastActivity.equals(activity)) {
-                    mActivityList.remove(activity);
-                    mActivityList.addLast(activity);
+            try {
+                synchronized (mActivityList) {
+                    if (mActivityList.contains(activity)) {
+                        if (!mActivityList.isEmpty() && !activity.equals(mActivityList.getLast())) {
+                            mActivityList.remove(activity);
+                            mActivityList.addLast(activity);
+                        }
+                    } else {
+                        mActivityList.addLast(activity);
+                    }
                 }
-            } else {
-                mActivityList.addLast(activity);
+            } catch (Exception e) {
+                android.util.Log.w("OneKey", "setTopActivity error: " + e.getMessage());
             }
         }
 
         @Nullable
         Activity getTopActivity() {
-            if (!mActivityList.isEmpty()) {
-                final Activity topActivity = mActivityList.getLast();
-                if (topActivity != null) {
-                    return topActivity;
+            synchronized (mActivityList) {
+                if (!mActivityList.isEmpty()) {
+                    final Activity topActivity = mActivityList.getLast();
+                    if (topActivity != null) {
+                        return topActivity;
+                    }
                 }
             }
             // using reflect to get top activity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-lite-card",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "lite card",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",