Merge branch 'develop'

* develop: update RM. v0.0.6
vhnguyen1001 · May 23, 2017 · 91d4368 · 91d4368
2 parents d9c468e + e260413
commit 91d4368
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ or
 ### **Installation**
 
 ```
-compile 'com.zxy.android:tiny:0.0.5'
+compile 'com.zxy.android:tiny:0.0.6'
 ```
 
 ### **Choose an abi**
@@ -129,6 +129,7 @@ android {
 * **v0.0.3**：Unified as `libtiny.so`
 * **v0.0.4**：Add cover source file configuration—see`{@link FileCompressOptions#overrideSource}`, and setting up the batch compressed file paths—see  `{@link BatchFileCompressOptions#outfiles}`
 * **v0.0.5**：Fix google store reject.
+* **v0.0.6**：Initialization is not must.Add clear compression directory method,see`{@link Tiny#clearCompressDirectory}`
 
 ## **License**
 

diff --git a/tiny/build.gradle b/tiny/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
 ext {
     upload_group_id = 'com.zxy.android'
-    upload_version = '0.0.5'
+    upload_version = '0.0.6'
 
     site_url = 'https://github.com/Sunzxyong/Tiny'
     git_url = 'https://github.com/Sunzxyong/Tiny.git'

diff --git a/tiny/src/main/java/com/zxy/tiny/Tiny.java b/tiny/src/main/java/com/zxy/tiny/Tiny.java
@@ -5,6 +5,7 @@
 import android.net.Uri;
 import android.text.TextUtils;
 
+import com.zxy.tiny.common.ApplicationLoader;
 import com.zxy.tiny.common.TinyException;
 import com.zxy.tiny.core.CompressEngine;
 import com.zxy.tiny.core.CompressKit;
@@ -43,6 +44,12 @@ public Tiny debug(boolean isDebug) {
         return this;
     }
 
+    /**
+     * Initialization is not must.
+     *
+     * @param application
+     */
+    @Deprecated
     public void init(Application application) {
         if (application == null)
             throw new TinyException.IllegalArgumentException("application can not be null!");
@@ -55,7 +62,7 @@ public boolean isDebug() {
 
     public Application getApplication() {
         if (mApplication == null)
-            throw new TinyException.UnsupportedOperationException("must initialize the 'Tiny' framework before use!");
+            mApplication = ApplicationLoader.get();
         return mApplication;
     }
 
@@ -107,6 +114,16 @@ public synchronized CompressEngine source(int[] resIds) {
         return new CompressEngine().source(resIds);
     }
 
+    public synchronized boolean clearCompressDirectory() {
+        File dir = FileKit.getDefaultFileCompressDirectory();
+        try {
+            return FileKit.clearDirectory(dir);
+        } catch (Exception e) {
+            //for android 6.0+,permission request
+        }
+        return false;
+    }
+
     public static class BitmapCompressOptions {
 
         /**

diff --git a/tiny/src/main/java/com/zxy/tiny/common/ApplicationLoader.java b/tiny/src/main/java/com/zxy/tiny/common/ApplicationLoader.java
@@ -0,0 +1,37 @@
+package com.zxy.tiny.common;
+
+import android.app.Application;
+
+import java.lang.reflect.Method;
+
+/**
+ * Created by zhengxiaoyong on 2017/5/23.
+ */
+public class ApplicationLoader {
+
+    private static Application sApplication;
+
+    public static Application get() {
+        return sApplication != null ? sApplication : getApplication();
+    }
+
+    private static Application getApplication() {
+        Application application = null;
+        Method method;
+        try {
+            method = Class.forName("android.app.AppGlobals").getDeclaredMethod("getInitialApplication");
+            method.setAccessible(true);
+            application = (Application) method.invoke(null);
+        } catch (Exception e) {
+            try {
+                method = Class.forName("android.app.ActivityThread").getDeclaredMethod("currentApplication");
+                method.setAccessible(true);
+                application = (Application) method.invoke(null);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return application;
+    }
+
+}
diff --git a/tiny/src/main/java/com/zxy/tiny/core/FileKit.java b/tiny/src/main/java/com/zxy/tiny/core/FileKit.java
@@ -4,6 +4,7 @@
 import android.text.TextUtils;
 
 import com.zxy.tiny.Tiny;
+import com.zxy.tiny.common.Logger;
 
 import java.io.File;
 import java.io.IOException;
@@ -91,4 +92,25 @@ public static File[] wrap(String[] filePaths) {
         }
         return files;
     }
+
+    public static boolean clearDirectory(File dir) {
+        if (dir == null || !dir.isDirectory() || !dir.exists())
+            return false;
+        File[] files = dir.listFiles();
+        int length = files.length;
+        for (int i = 0; i < length; i++) {
+            File file = files[i];
+            if (file == null)
+                continue;
+            if (file.isFile() && file.exists()) {
+                boolean result = file.delete();
+                Logger.e(file.getName() + (result ? " delete success!" : " delete failed!"));
+                continue;
+            }
+            if (file.isDirectory() && file.exists()) {
+                clearDirectory(file);
+            }
+        }
+        return true;
+    }
 }