Merge pull request Blankj#752 from Blankj/1.22.3

see 12/17 log

Author: Blankj

CHANGELOG.md

@@ -1,3 +1,4 @@
+* `18/12/17` [fix] Utils$FileProvider4UtilCode not found. Publish v1.22.3.
 * `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.

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.2-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.3-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.22.2-brightgreen.svg
+[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.22.3-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

config.gradle

@@ -5,8 +5,8 @@ ext {
     compileSdkVersion = 27
     minSdkVersion = 14
     targetSdkVersion = 27
-    versionCode = 1_022_002
-    versionName = '1.22.2'// E.g. 1.9.72 => 1,009,072
+    versionCode = 1_022_003
+    versionName = '1.22.3'// E.g. 1.9.72 => 1,009,072
 
     bus = [
             isDebug: false,

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.2'
+//    api 'com.blankj:utilcode:1.22.3'
 }

utilcode/README-CN.md

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

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.2"
+api "com.blankj:utilcode:1.22.3"
 ```
 
 比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

utilcode/README.md

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

utilcode/lib/src/main/AndroidManifest.xml

@@ -9,15 +9,15 @@
             android:theme="@style/ActivityTranslucent"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
 
-        <!--<provider-->
-            <!--android:name=".util.Utils$FileProvider4UtilCode"-->
-            <!--android:authorities="${applicationId}.utilcode.provider"-->
-            <!--android:exported="false"-->
-            <!--android:grantUriPermissions="true"-->
-            <!--android:multiprocess="true">-->
-            <!--<meta-data-->
-                <!--android:name="android.support.FILE_PROVIDER_PATHS"-->
-                <!--android:resource="@xml/util_code_provider_paths" />-->
-        <!--</provider>-->
+        <provider
+            android:name=".util.Utils$FileProvider4UtilCode"
+            android:authorities="${applicationId}.utilcode.provider"
+            android:exported="false"
+            android:grantUriPermissions="true"
+            android:multiprocess="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/util_code_provider_paths" />
+        </provider>
     </application>
 </manifest>

utilcode/lib/src/main/java/com/blankj/utilcode/util/BusUtils.java

@@ -7,6 +7,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * <pre>
@@ -20,7 +22,8 @@
  */
 public final class BusUtils {
 
-    private static final Object NULL = new Object();
+    private static final Object              NULL  = new Object();
+    private static final Map<Object, String> BUSES = new ConcurrentHashMap<>();
 
     public static <T> T post(String name, Object... objects) {
         if (name == null || name.length() == 0) return null;

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

@@ -7,6 +7,7 @@
 import android.app.Application.ActivityLifecycleCallbacks;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.v4.content.FileProvider;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -331,14 +332,14 @@ private Activity getTopActivityByReflect() {
         }
     }
 
-//    public static final class FileProvider4UtilCode extends FileProvider {
-//
-//        @Override
-//        public boolean onCreate() {
-//            Utils.init(getContext());
-//            return true;
-//        }
-//    }
+    public static final class FileProvider4UtilCode extends FileProvider {
+
+        @Override
+        public boolean onCreate() {
+            Utils.init(getContext());
+            return true;
+        }
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // interface