see 08/06 log

Author: Blankj

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.18.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

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.18.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.18.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -6,8 +6,8 @@ ext {
             compileSdkVersion: 27,
             minSdkVersion    : 14,
             targetSdkVersion : 27,
-            versionCode      : 1_018_001,
-            versionName      : '1.18.1'// E.g 1.9.72 => 1,009,072
+            versionCode      : 1_018_002,
+            versionName      : '1.18.2'// E.g 1.9.72 => 1,009,072
     ]
 
     versionConfig = [
@@ -155,7 +155,7 @@ def configAppDependencies(Project pro) {
         // LeakCanary
         debugImplementation depConfig.leakcanary.android
         releaseImplementation depConfig.leakcanary.android_no_op
-//        implementation 'com.blankj:utilcode:1.18.1'
+//        implementation 'com.blankj:utilcode:1.18.2'
     }
 }
 

update_log.md

@@ -1,3 +1,4 @@
+* 18/08/05 修复 1.18.0 版本删去 `if (activity.getClass() == PermissionUtils.PermissionActivity.class) return;` 造成 PermissionUtils 获取栈顶 Activity 问题，发布 1.18.2
 * 18/08/04 新增 LogUtils#Config#setSaveDays，发布 1.18.1
 * 18/08/03 新增 LogUtils#Config#addFormatter，并新增 Array, Throwable, Bundle, Intent 的格式化输出
 * 18/08/02 修复 TimeUtils 中的 SimpleDateFormat 为 ThreadLocal 实现

utilcode/README-CN.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.18.1'
+implementation 'com.blankj:utilcode:1.18.2'
 ```
 
 

utilcode/README.md

@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.18.1'
+implementation 'com.blankj:utilcode:1.18.2'
 ```
 
 

utilcode/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.blankj.utilcode">
+    package="com.blankj.utilcode">
 
     <application>
         <activity

utilcode/src/main/java/com/blankj/utilcode/util/ObjectUtils.java

@@ -184,22 +184,6 @@ public static boolean equals(final Object o1, final Object o2) {
         return o1 == o2 || (o1 != null && o1.equals(o2));
     }
 
-    /**
-     * Require the object is not null.
-     *
-     * @param object  The object.
-     * @param message The message to use with the NullPointerException.
-     * @param <T>     The value type.
-     * @return the object
-     * @throws NullPointerException if object is null
-     */
-    public static <T> T requireNonNull(final T object, final String message) {
-        if (object == null) {
-            throw new NullPointerException(message);
-        }
-        return object;
-    }
-
     /**
      * Require the objects are not null.
      *

utilcode/src/main/java/com/blankj/utilcode/util/Utils.java

@@ -204,6 +204,7 @@ private void postStatus(final boolean isForeground) {
         }
 
         private void setTopActivity(final Activity activity) {
+            if (activity.getClass() == PermissionUtils.PermissionActivity.class) return;
             if (mActivityList.contains(activity)) {
                 if (!mActivityList.getLast().equals(activity)) {
                     mActivityList.remove(activity);

utilcode/src/test/java/com/blankj/utilcode/util/BaseRobolectricTest.java renamed to utilcode/src/test/java/com/blankj/utilcode/util/BaseTest.java

@@ -16,15 +16,14 @@
  */
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
-public class BaseRobolectricTest {
+public class BaseTest {
 
-    public BaseRobolectricTest() {
+    public BaseTest() {
         Utils.init(RuntimeEnvironment.application);
     }
 
     @Test
     public void test() {
 
     }
-
 }

utilcode/src/test/java/com/blankj/utilcode/util/CacheDiskUtilsTest.java

@@ -11,9 +11,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.io.Serializable;
@@ -32,7 +29,7 @@
  *     desc  : test CacheDiskUtils
  * </pre>
  */
-public class CacheDiskUtilsTest extends BaseRobolectricTest {
+public class CacheDiskUtilsTest extends BaseTest {
 
     private final String           disk1Path         = PATH_CACHE + "disk1" + FILE_SEP;
     private final String           disk2Path         = PATH_CACHE + "disk2" + FILE_SEP;

utilcode/src/test/java/com/blankj/utilcode/util/CacheDoubleUtilsTest.java

@@ -11,9 +11,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.io.Serializable;
@@ -32,7 +29,7 @@
  *     desc  :
  * </pre>
  */
-public class CacheDoubleUtilsTest extends BaseRobolectricTest {
+public class CacheDoubleUtilsTest extends BaseTest {
 
     private CacheDiskUtils   mCacheDiskUtils;
     private CacheMemoryUtils mCacheMemoryUtils;

utilcode/src/test/java/com/blankj/utilcode/util/EncodeUtilsTest.java

@@ -1,9 +1,6 @@
 package com.blankj.utilcode.util;
 
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.util.Arrays;
 
@@ -18,7 +15,7 @@
  *     desc  : test EncodeUtils
  * </pre>
  */
-public class EncodeUtilsTest extends BaseRobolectricTest{
+public class EncodeUtilsTest extends BaseTest {
 
     @Test
     public void urlEncode_urlDecode() {

utilcode/src/test/java/com/blankj/utilcode/util/EncryptUtilsTest.java

@@ -4,9 +4,6 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.util.Arrays;
@@ -24,7 +21,7 @@
  *     desc  : test EncryptUtils
  * </pre>
  */
-public class EncryptUtilsTest extends BaseRobolectricTest{
+public class EncryptUtilsTest extends BaseTest {
     @Test
     public void encryptMD2() {
         String blankjMD2 = "15435017570D8A73449E25C4622E17A4";