see 12/17 log

Blankj · Blankj · commit e265d786bd16 · 2018-12-17T02:39:29.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.
 * `18/12/09` [add] Component for the project.
 * `18/12/04` [add] BusUtils. Publish v1.22.1.
 * `18/11/18` [fix] ToastUtils don't show in the devices grater than API 24 when close the permission of notification. Publish v1.22.0.
diff --git a/README-CN.md b/README-CN.md
@@ -41,7 +41,7 @@
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
 
 [logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
 
-[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.1-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/launcher/app/__bus__.json b/launcher/app/__bus__.json
@@ -1,3 +1,4 @@
 {
+  "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",
   "CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"
 }
diff --git a/lib/base/build.gradle b/lib/base/build.gradle
@@ -4,7 +4,7 @@ apply {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    api project(':utilcode-lib')
+//    api project(':utilcode-lib')
     api project(':subutil-lib')
 
     api dep.support.appcompat_v7
@@ -15,5 +15,5 @@ dependencies {
     api dep.free_proguard
     api 'com.r0adkll:slidableactivity:2.0.5'
     compileOnly dep.leakcanary.android_no_op
-//    api 'com.blankj:utilcode:1.22.1'
+    api 'com.blankj:utilcode:1.22.2'
 }
diff --git a/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.java b/subutil/pkg/src/main/java/com/blankj/subutil/pkg/helper/DialogHelper.java
@@ -4,7 +4,7 @@
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 
-import com.blankj.subutil.R.pkg;
+import com.blankj.subutil.pkg.R;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.PermissionUtils;
 import com.blankj.utilcode.util.PermissionUtils.OnRationaleListener.ShouldRequest;
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.22.1'
+implementation 'com.blankj:utilcode:1.22.2'
 ```
 
 
diff --git a/utilcode/README-STATIC-BUS.md b/utilcode/README-STATIC-BUS.md
@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
 给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
 
 ```groovy
-api "com.blankj:utilcode:1.22.1"
+api "com.blankj:utilcode:1.22.2"
 ```
 
 比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：
diff --git a/utilcode/README.md b/utilcode/README.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.22.1'
+implementation 'com.blankj:utilcode:1.22.2'
 ```
 
 
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
@@ -49,7 +49,7 @@ private AppUtils() {
      */
     public static void registerAppStatusChangedListener(@NonNull final Object obj,
                                                         @NonNull final Utils.OnAppStatusChangedListener listener) {
-        Utils.getActivityLifecycle().addListener(obj, listener);
+        Utils.getActivityLifecycle().addOnAppStatusChangedListener(obj, listener);
     }
 
     /**
@@ -58,7 +58,7 @@ public static void registerAppStatusChangedListener(@NonNull final Object obj,
      * @param obj The object.
      */
     public static void unregisterAppStatusChangedListener(@NonNull final Object obj) {
-        Utils.getActivityLifecycle().removeListener(obj);
+        Utils.getActivityLifecycle().removeOnAppStatusChangedListener(obj);
     }
 
     /**
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/ToastUtils.java
@@ -251,7 +251,7 @@ private static void show(final CharSequence text, final int duration) {
             @Override
             public void run() {
                 cancel();
-                iToast = ToastFactory.makeToast(Utils.getTopActivityOrApp(), text, duration);
+                iToast = ToastFactory.makeToast(Utils.getApp(), text, duration);
                 final TextView tvMessage = iToast.getView().findViewById(android.R.id.message);
                 if (sMsgColor != COLOR_DEFAULT) {
                     tvMessage.setTextColor(sMsgColor);
@@ -416,11 +416,18 @@ public void dispatchMessage(Message msg) {
     static class ToastWithoutNotification extends AbsToast {
 
         private WindowManager mWM;
-
-        private View mView;
+        private View          mView;
 
         private WindowManager.LayoutParams mParams = new WindowManager.LayoutParams();
 
+        private Utils.OnActivityDestroyedListener listener =
+                new Utils.OnActivityDestroyedListener() {
+                    @Override
+                    public void onActivityDestroyed(Activity activity) {
+                        cancel();
+                    }
+                };
+
         ToastWithoutNotification(Toast toast) {
             super(toast);
         }
@@ -437,20 +444,12 @@ public void show() {
             } else {
                 Context topActivityOrApp = Utils.getTopActivityOrApp();
                 if (topActivityOrApp instanceof Activity) {
-                    mWM = ((Activity) topActivityOrApp).getWindowManager();
+                    Activity topActivity = (Activity) topActivityOrApp;
+                    mWM = topActivity.getWindowManager();
+                    Utils.getActivityLifecycle().addOnActivityDestroyedListener(topActivity, listener);
                 }
                 mParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
                 mParams.y = mToast.getYOffset() + getNavBarHeight();
-                if (Utils.getActivityLifecycle().getOnActivityDestroyedListener() == null) {
-                    Utils.getActivityLifecycle().setOnActivityDestroyedListener(
-                            new Utils.OnActivityDestroyedListener() {
-                                @Override
-                                public void onActivityDestroyed(Activity activity) {
-                                    cancel();
-                                }
-                            }
-                    );
-                }
             }
 
             final Configuration config = context.getResources().getConfiguration();
@@ -496,7 +495,7 @@ public void run() {
         public void cancel() {
             try {
                 if (mWM != null) {
-                    mWM.removeView(mView);
+                    mWM.removeViewImmediate(mView);
                 }
             } catch (Exception ignored) { /**/ }
             mView = null;
diff --git a/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/lib/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -11,9 +11,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <pre>
@@ -157,28 +159,12 @@ static class ActivityLifecycleImpl implements ActivityLifecycleCallbacks {
         final LinkedList<Activity>                        mActivityList      = new LinkedList<>();
         final HashMap<Object, OnAppStatusChangedListener> mStatusListenerMap = new HashMap<>();
 
-        private OnActivityDestroyedListener mOnActivityDestroyedListener;
+        final HashMap<Activity, Set<OnActivityDestroyedListener>> mDestroyedListenerMap = new HashMap<>();
 
         private int     mForegroundCount = 0;
         private int     mConfigCount     = 0;
         private boolean mIsBackground    = false;
 
-        OnActivityDestroyedListener getOnActivityDestroyedListener() {
-            return mOnActivityDestroyedListener;
-        }
-
-        void setOnActivityDestroyedListener(OnActivityDestroyedListener onActivityDestroyedListener) {
-            mOnActivityDestroyedListener = onActivityDestroyedListener;
-        }
-
-        void addListener(final Object object, final OnAppStatusChangedListener listener) {
-            mStatusListenerMap.put(object, listener);
-        }
-
-        void removeListener(final Object object) {
-            mStatusListenerMap.remove(object);
-        }
-
         @Override
         public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
             setTopActivity(activity);
@@ -229,9 +215,49 @@ public void onActivitySaveInstanceState(Activity activity, Bundle outState) {/**
         @Override
         public void onActivityDestroyed(Activity activity) {
             mActivityList.remove(activity);
-            if (mOnActivityDestroyedListener != null) {
-                mOnActivityDestroyedListener.onActivityDestroyed(activity);
+            consumeOnActivityDestroyedListener(activity);
+        }
+
+        Activity getTopActivity() {
+            if (!mActivityList.isEmpty()) {
+                final Activity topActivity = mActivityList.getLast();
+                if (topActivity != null) {
+                    return topActivity;
+                }
+            }
+            Activity topActivityByReflect = getTopActivityByReflect();
+            if (topActivityByReflect != null) {
+                setTopActivity(topActivityByReflect);
+            }
+            return topActivityByReflect;
+        }
+
+        void addOnAppStatusChangedListener(final Object object,
+                                           final OnAppStatusChangedListener listener) {
+            mStatusListenerMap.put(object, listener);
+        }
+
+        void removeOnAppStatusChangedListener(final Object object) {
+            mStatusListenerMap.remove(object);
+        }
+
+        void removeOnActivityDestroyedListener(final Activity activity) {
+            if (activity == null) return;
+            mDestroyedListenerMap.remove(activity);
+        }
+
+        void addOnActivityDestroyedListener(final Activity activity,
+                                            final OnActivityDestroyedListener listener) {
+            if (activity == null || listener == null) return;
+            Set<OnActivityDestroyedListener> listeners;
+            if (!mDestroyedListenerMap.containsKey(activity)) {
+                listeners = new HashSet<>();
+                mDestroyedListenerMap.put(activity, listeners);
+            } else {
+                listeners = mDestroyedListenerMap.get(activity);
+                if (listeners.contains(listener)) return;
             }
+            listeners.add(listener);
         }
 
         private void postStatus(final boolean isForeground) {
@@ -258,18 +284,17 @@ private void setTopActivity(final Activity activity) {
             }
         }
 
-        Activity getTopActivity() {
-            if (!mActivityList.isEmpty()) {
-                final Activity topActivity = mActivityList.getLast();
-                if (topActivity != null) {
-                    return topActivity;
+        private void consumeOnActivityDestroyedListener(Activity activity) {
+            Set<Map.Entry<Activity, Set<OnActivityDestroyedListener>>> entries = mDestroyedListenerMap.entrySet();
+            for (Map.Entry<Activity, Set<OnActivityDestroyedListener>> entry : entries) {
+                if (entry.getKey() == activity) {
+                    Set<OnActivityDestroyedListener> value = entry.getValue();
+                    for (OnActivityDestroyedListener listener : value) {
+                        listener.onActivityDestroyed(activity);
+                    }
+                    removeOnActivityDestroyedListener(activity);
                 }
             }
-            Activity topActivityByReflect = getTopActivityByReflect();
-            if (topActivityByReflect != null) {
-                setTopActivity(topActivityByReflect);
-            }
-            return topActivityByReflect;
         }
 
         private Activity getTopActivityByReflect() {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+* `18/12/17` [fix] ToastUtils leak. Publish v1.22.2.
`1`	`2`	* `18/12/09` [add] Component for the project.
`2`	`3`	* `18/12/04` [add] BusUtils. Publish v1.22.1.
`3`	`4`	* `18/11/18` [fix] ToastUtils don't show in the devices grater than API 24 when close the permission of notification. Publish v1.22.0.
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`{`
	`2`	`+ "SubUtilActivity#start": "void com.blankj.subutil.pkg.feature.SubUtilActivity.start(android.content.Context)",`
`2`	`3`	`"CoreUtilActivity#start": "void com.blankj.utilcode.pkg.feature.CoreUtilActivity.start(android.content.Context)"`
`3`	`4`	`}`