see 06/29 log

Blankj · Blankj · commit c8b2c8daf0d1 · 2018-06-29T14:09:47.000+08:00
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.17.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.17.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.17.1-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.17.2-brightgreen.svg
 [auc]: https://github.com/Blankj/AndroidUtilCode
 
 [apisvg]: https://img.shields.io/badge/API-14+-brightgreen.svg
diff --git a/app/build.gradle b/app/build.gradle
@@ -57,5 +57,5 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
-//    implementation 'com.blankj:utilcode:1.17.1'
+//    implementation 'com.blankj:utilcode:1.17.2'
 }
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         min_sdk_version = 14
         target_sdk_version = 27
 
-        version_code = 1_017_001
-        version_name = '1.17.1'// E.g 1.9.72 => 1,009,072
+        version_code = 1_017_002
+        version_name = '1.17.2'// E.g 1.9.72 => 1,009,072
 
         // App dependencies
         support_version = '27.1.0'
diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,5 @@
+* 18/06/29 修复 FragmentUtils 中 getFragmentManager 空指针错误，发布 1.17.2
+* 18/06/27 新增 UriUtils#uri2File
 * 18/06/25 新增 KeyboardUtils#fixAndroidBug5497，发布 1.17.1 版本
 * 18/06/21 修复 FragmentUtils#add 死循环的 BUG
 * 18/06/14 替换 CacheUtils 为 CacheDiskUtils，CacheUtils 标记 deprecated，发布 1.17.0 版本
diff --git a/utilcode/README-CN.md b/utilcode/README-CN.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.17.1'
+implementation 'com.blankj:utilcode:1.17.2'
 ```
 
 
@@ -745,7 +745,8 @@ cancel         : 取消吐司显示
 
 * ### URI 相关 -> [UriUtils.java][uri.java]
 ```
-getUriForFile: 获取文件 URI
+file2Uri: file 转 uri
+uri2File: uri 转 file
 ```
 
 * ### 压缩相关 -> [ZipUtils.java][zip.java] -> [Test][zip.test]
diff --git a/utilcode/README.md b/utilcode/README.md
@@ -2,7 +2,7 @@
 
 Gradle:
 ```groovy
-implementation 'com.blankj:utilcode:1.17.1'
+implementation 'com.blankj:utilcode:1.17.2'
 ```
 
 
@@ -745,7 +745,8 @@ cancel
 
 * ### About Uri -> [UriUtils.java][uri.java]
 ```
-getUriForFile
+file2Uri
+uri2File
 ```
 
 * ### About Zip -> [ZipUtils.java][zip.java] -> [Test][zip.test]
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskUtils.java
@@ -41,7 +41,7 @@
  *     author: Blankj
  *     blog  : http://blankj.com
  *     time  : 2017/05/24
- *     desc  : utils about cache
+ *     desc  : utils about disk cache
  * </pre>
  */
 public final class CacheDiskUtils implements CacheConstants {
@@ -128,7 +128,7 @@ public static CacheDiskUtils getInstance(@NonNull final File cacheDir) {
     public static CacheDiskUtils getInstance(@NonNull final File cacheDir,
                                              final long maxSize,
                                              final int maxCount) {
-        final String cacheKey = cacheDir.getAbsoluteFile() + "_" + maxCount + "_" + maxCount;
+        final String cacheKey = cacheDir.getAbsoluteFile() + "_" + maxSize + "_" + maxCount;
         CacheDiskUtils cache = CACHE_MAP.get(cacheKey);
         if (cache == null) {
             if (!cacheDir.exists() && !cacheDir.mkdirs()) {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/CacheMemoryUtils.java
@@ -13,7 +13,7 @@
  *     author: Blankj
  *     blog  : http://blankj.com
  *     time  : 2017/05/24
- *     desc  : utils about LRU cache
+ *     desc  : utils about memory cache
  * </pre>
  */
 public final class CacheMemoryUtils implements CacheConstants {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/CacheUtils.java
@@ -131,7 +131,7 @@ public static CacheUtils getInstance(@NonNull final File cacheDir) {
     public static CacheUtils getInstance(@NonNull final File cacheDir,
                                          final long maxSize,
                                          final int maxCount) {
-        final String cacheKey = cacheDir.getAbsoluteFile() + "_" + maxCount + "_" + maxCount;
+        final String cacheKey = cacheDir.getAbsoluteFile() + "_" + maxSize + "_" + maxCount;
         CacheUtils cache = CACHE_MAP.get(cacheKey);
         if (cache == null) {
             if (!cacheDir.exists() && !cacheDir.mkdirs()) {
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/FragmentUtils.java
@@ -8,6 +8,7 @@
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -933,8 +934,10 @@ public static void replace(@NonNull final Fragment srcFragment,
                                @NonNull final Fragment destFragment,
                                final String destTag,
                                final boolean isAddStack) {
+        FragmentManager fm = srcFragment.getFragmentManager();
+        if (fm == null) return;
         Args args = getArgs(srcFragment);
-        replace(srcFragment.getFragmentManager(), destFragment, args.id, destTag, isAddStack);
+        replace(fm, destFragment, args.id, destTag, isAddStack);
     }
 
     /**
@@ -1031,8 +1034,10 @@ public static void replace(@NonNull final Fragment srcFragment,
                                @AnimRes final int exitAnim,
                                @AnimRes final int popEnterAnim,
                                @AnimRes final int popExitAnim) {
+        FragmentManager fm = srcFragment.getFragmentManager();
+        if (fm == null) return;
         Args args = getArgs(srcFragment);
-        replace(srcFragment.getFragmentManager(), destFragment, args.id, destTag, isAddStack,
+        replace(fm, destFragment, args.id, destTag, isAddStack,
                 enterAnim, exitAnim, popEnterAnim, popExitAnim);
     }
 
@@ -1067,8 +1072,10 @@ public static void replace(@NonNull final Fragment srcFragment,
                                final String destTag,
                                final boolean isAddStack,
                                final View... sharedElements) {
+        FragmentManager fm = srcFragment.getFragmentManager();
+        if (fm == null) return;
         Args args = getArgs(srcFragment);
-        replace(srcFragment.getFragmentManager(),
+        replace(fm,
                 destFragment,
                 args.id,
                 destTag,
@@ -1399,21 +1406,23 @@ private static void putArgs(final Fragment fragment, final boolean isHide) {
 
     private static Args getArgs(final Fragment fragment) {
         Bundle bundle = fragment.getArguments();
+        if (bundle == null) bundle = Bundle.EMPTY;
         return new Args(bundle.getInt(ARGS_ID, fragment.getId()),
                 bundle.getBoolean(ARGS_IS_HIDE),
                 bundle.getBoolean(ARGS_IS_ADD_STACK));
     }
 
-    private static void operateNoAnim(final FragmentManager fm,
+    private static void operateNoAnim(@Nullable final FragmentManager fm,
                                       final int type,
                                       final Fragment src,
                                       Fragment... dest) {
+        if (fm == null) return;
         FragmentTransaction ft = fm.beginTransaction();
         operate(type, fm, ft, src, dest);
     }
 
     private static void operate(final int type,
-                                final FragmentManager fm,
+                                @NonNull final FragmentManager fm,
                                 final FragmentTransaction ft,
                                 final Fragment src,
                                 final Fragment... dest) {
@@ -1528,7 +1537,8 @@ private static Fragment getTopIsInStack(@NonNull final FragmentManager fm,
             Fragment fragment = fragments.get(i);
             if (fragment != null) {
                 if (isInStack) {
-                    if (fragment.getArguments().getBoolean(ARGS_IS_ADD_STACK)) {
+                    Bundle args = fragment.getArguments();
+                    if (args != null && args.getBoolean(ARGS_IS_ADD_STACK)) {
                         return fragment;
                     }
                 } else {
@@ -1569,7 +1579,8 @@ private static Fragment getTopShowIsInStack(@NonNull final FragmentManager fm,
                     && fragment.isVisible()
                     && fragment.getUserVisibleHint()) {
                 if (isInStack) {
-                    if (fragment.getArguments().getBoolean(ARGS_IS_ADD_STACK)) {
+                    Bundle args = fragment.getArguments();
+                    if (args != null && args.getBoolean(ARGS_IS_ADD_STACK)) {
                         return fragment;
                     }
                 } else {
@@ -1587,7 +1598,6 @@ private static Fragment getTopShowIsInStack(@NonNull final FragmentManager fm,
      * @return the fragments in manager
      */
     public static List<Fragment> getFragments(@NonNull final FragmentManager fm) {
-        @SuppressWarnings("RestrictedApi")
         List<Fragment> fragments = fm.getFragments();
         if (fragments == null || fragments.isEmpty()) return Collections.emptyList();
         return fragments;
@@ -1603,8 +1613,11 @@ public static List<Fragment> getFragmentsInStack(@NonNull final FragmentManager
         List<Fragment> fragments = getFragments(fm);
         List<Fragment> result = new ArrayList<>();
         for (Fragment fragment : fragments) {
-            if (fragment != null && fragment.getArguments().getBoolean(ARGS_IS_ADD_STACK)) {
-                result.add(fragment);
+            if (fragment != null) {
+                Bundle args = fragment.getArguments();
+                if (args != null && args.getBoolean(ARGS_IS_ADD_STACK)) {
+                    result.add(fragment);
+                }
             }
         }
         return result;
@@ -1649,10 +1662,13 @@ private static List<FragmentNode> getAllFragmentsInStack(@NonNull final Fragment
         List<Fragment> fragments = getFragments(fm);
         for (int i = fragments.size() - 1; i >= 0; --i) {
             Fragment fragment = fragments.get(i);
-            if (fragment != null && fragment.getArguments().getBoolean(ARGS_IS_ADD_STACK)) {
-                result.add(new FragmentNode(fragment,
-                        getAllFragmentsInStack(fragment.getChildFragmentManager(),
-                                new ArrayList<FragmentNode>())));
+            if (fragment != null) {
+                Bundle args = fragment.getArguments();
+                if (args != null && args.getBoolean(ARGS_IS_ADD_STACK)) {
+                    result.add(new FragmentNode(fragment,
+                            getAllFragmentsInStack(fragment.getChildFragmentManager(),
+                                    new ArrayList<FragmentNode>())));
+                }
             }
         }
         return result;
@@ -1774,10 +1790,10 @@ public static String getSimpleName(final Fragment fragment) {
     }
 
     private static class Args {
-        int     id;
-        boolean isHide;
-        boolean isAddStack;
-        String  tag;
+        final int     id;
+        final boolean isHide;
+        final boolean isAddStack;
+        final String  tag;
 
         private Args(final int id, final boolean isHide, final boolean isAddStack) {
             this(id, null, isHide, isAddStack);
@@ -1793,8 +1809,8 @@ private Args(final int id, final String tag,
     }
 
     public static class FragmentNode {
-        Fragment           fragment;
-        List<FragmentNode> next;
+        final Fragment           fragment;
+        final List<FragmentNode> next;
 
         public FragmentNode(final Fragment fragment, final List<FragmentNode> next) {
             this.fragment = fragment;
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/UriUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/UriUtils.java
@@ -1,7 +1,10 @@
 package com.blankj.utilcode.util;
 
+import android.content.CursorLoader;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.Build;
+import android.provider.MediaStore;
 import android.support.v4.content.FileProvider;
 
 import java.io.File;
@@ -21,12 +24,20 @@ private UriUtils() {
     }
 
     /**
-     * Return a content URI for a given file.
+     * @deprecated Use {@link UriUtils#file2Uri(File)} instead.
+     */
+    @Deprecated
+    public static Uri getUriForFile(final File file) {
+        return file2Uri(file);
+    }
+
+    /**
+     * File to uri.
      *
      * @param file The file.
-     * @return a content URI for a given file
+     * @return uri
      */
-    public static Uri getUriForFile(final File file) {
+    public static Uri file2Uri(final File file) {
         if (file == null) return null;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             String authority = Utils.getApp().getPackageName() + ".utilcode.provider";
@@ -35,4 +46,23 @@ public static Uri getUriForFile(final File file) {
             return Uri.fromFile(file);
         }
     }
+
+    /**
+     * Uri to file.
+     *
+     * @param uri        The uri.
+     * @param columnName The name of the target column.
+     *                   <p>e.g. {@link MediaStore.Images.Media#DATA}</p>
+     * @return file
+     */
+    public static File uri2File(final Uri uri, final String columnName) {
+        if (uri == null) return null;
+        CursorLoader cl = new CursorLoader(Utils.getApp());
+        cl.setUri(uri);
+        cl.setProjection(new String[]{columnName});
+        Cursor cursor = cl.loadInBackground();
+        int columnIndex = cursor.getColumnIndexOrThrow(columnName);
+        cursor.moveToFirst();
+        return new File(cursor.getString(columnIndex));
+    }
 }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java b/utilcode/src/main/java/com/blankj/utilcode/util/Utils.java
@@ -40,7 +40,7 @@ public final class Utils {
     @SuppressLint("StaticFieldLeak")
     private static Application sApplication;
 
-    private static final ActivityLifecycleImpl ACTIVITY_LIFECYCLE = new ActivityLifecycleImpl();
+    static final ActivityLifecycleImpl ACTIVITY_LIFECYCLE = new ActivityLifecycleImpl();
 
     private Utils() {
         throw new UnsupportedOperationException("u can't instantiate me...");

Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ dependencies {`
`57`	`57`	`implementation 'com.android.support.constraint:constraint-layout:1.1.0'`
`58`	`58`	`debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"`
`59`	`59`	`releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"`
`60`		`-// implementation 'com.blankj:utilcode:1.17.1'`
	`60`	`+// implementation 'com.blankj:utilcode:1.17.2'`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+* 18/06/29 修复 FragmentUtils 中 getFragmentManager 空指针错误，发布 1.17.2`
	`2`	`+* 18/06/27 新增 UriUtils#uri2File`
`1`	`3`	`* 18/06/25 新增 KeyboardUtils#fixAndroidBug5497，发布 1.17.1 版本`
`2`	`4`	`* 18/06/21 修复 FragmentUtils#add 死循环的 BUG`
`3`	`5`	`* 18/06/14 替换 CacheUtils 为 CacheDiskUtils，CacheUtils 标记 deprecated，发布 1.17.0 版本`