修复 WindowLifecycle.unregister 在极端情况下会出现空指针的问题

Author: getActivity

README.md

@@ -37,7 +37,7 @@ android {
 
 dependencies {
     // 吐司框架：https://github.com/getActivity/ToastUtils
-    implementation 'com.github.getActivity:ToastUtils:9.0'
+    implementation 'com.github.getActivity:ToastUtils:9.1'
 }
 ```
 

ToastUtils.apk

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.toast.demo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 90
-        versionName "9.0"
+        versionCode 91
+        versionName "9.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -29,12 +29,16 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':library')
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    // 标题栏：https://github.com/getActivity/TitleBar
-    implementation 'com.hjq:titlebar:8.5'
-    // 悬浮窗：https://github.com/getActivity/XToast
-    implementation 'com.hjq:xtoast:6.9'
+
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.github.getActivity:XXPermissions:10.8'
+
+    // 标题栏框架：https://github.com/getActivity/TitleBar
+    implementation 'com.github.getActivity:TitleBar:8.5'
+
+    // 悬浮窗框架：https://github.com/getActivity/XToast
+    implementation 'com.github.getActivity:XToast:6.9'
+
     // 内存泄漏捕捉：https://github.com/square/leakcanary
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-    // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.hjq:xxpermissions:10.6'
 }

app/build.gradle

@@ -2,28 +2,31 @@
 
 buildscript {
     repositories {
-        jcenter()
+        // 阿里云云效仓库：https://maven.aliyun.com/mvn/guide
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        // 华为开源镜像：https://mirrors.huaweicloud.com/
+        maven { url 'https://repo.huaweicloud.com/repository/maven/' }
+        // JitPack 远程仓库：https://jitpack.io
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://repo.huaweicloud.com/repository/maven/' }
+        maven { url 'https://jitpack.io' }
+        mavenCentral()
         google()
-        maven {url "https://jitpack.io"}
-    }
-
-    //解决app:mockableAndroidJar错误的问题
-    gradle.taskGraph.whenReady {
-        tasks.each { task ->
-            if (task.name.equals('mockableAndroidJar')) {
-                task.enabled = false
-            }
-        }
+        jcenter()
     }
 }
 

build.gradle

@@ -1,5 +1,5 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+zipStoreBase = GRADLE_USER_HOME
+zipStorePath = wrapper/dists
+distributionBase = GRADLE_USER_HOME
+distributionPath = wrapper/dists
+distributionUrl = https\://services.gradle.org/distributions/gradle-6.5-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -5,8 +5,8 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 90
-        versionName "9.0"
+        versionCode 91
+        versionName "9.1"
     }
 
     // 使用 JDK 1.8

library/build.gradle

@@ -52,8 +52,7 @@ public void onActivityPaused(Activity activity) {
             return;
         }
 
-        // 取消这个吐司的显示
-        if (mToastImpl == null || !mToastImpl.isShow()) {
+        if (mToastImpl == null) {
             return;
         }
 
@@ -73,21 +72,38 @@ public void onActivityDestroyed(Activity activity) {
         if (mActivity != activity) {
             return;
         }
+
+        if (mToastImpl != null) {
+            mToastImpl.cancel();
+        }
+
         unregister();
         mActivity = null;
     }
 
+    /**
+     * 注册
+     */
     void register(ToastImpl impl) {
         mToastImpl = impl;
+        if (mActivity == null) {
+            return;
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             mActivity.registerActivityLifecycleCallbacks(this);
         } else {
             mActivity.getApplication().registerActivityLifecycleCallbacks(this);
         }
     }
 
+    /**
+     * 反注册
+     */
     void unregister() {
         mToastImpl = null;
+        if (mActivity == null) {
+            return;
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             mActivity.unregisterActivityLifecycleCallbacks(this);
         } else {