Merge pull request #11 from coderpage/dev-0.5.1

Dev 0.5.1
coderpage · Dec 30, 2017 · e8b53fe · e8b53fe
2 parents a050351 + 4fe39f6
commit e8b53fe
Show file tree

Hide file tree

Showing 57 changed files with 1,909 additions and 715 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,7 +28,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
-            minifyEnabled true
+            minifyEnabled false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
@@ -60,7 +60,7 @@ apply plugin: 'com.coderpage.app'
 uploader {
 //    apiServer = 'http://127.0.0.1:8001'
     token = rootProject.releaseToken
-    appName = '我的.记账本'
+    appName = '我的记账本'
     changeLog = file("${rootDir}/source/changelog/${rootProject.appVersionName}").text;
     isRelease = true
 }
@@ -79,6 +79,8 @@ dependencies {
     compile rootProject.buglyCrashReport
     compile rootProject.fastjson
     compile rootProject.retrofitConverterFastjson
+    compile rootProject.permissions4m
+    annotationProcessor rootProject.permissions4mProcessor
 
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'

diff --git a/app/src/main/java/com/coderpage/mine/app/tally/backup/BackupCache.java b/app/src/main/java/com/coderpage/mine/app/tally/backup/BackupCache.java
@@ -4,11 +4,11 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.coderpage.base.cache.Cache;
 import com.coderpage.base.common.Callback;
 import com.coderpage.base.common.IError;
 import com.coderpage.base.common.NonThrowError;
 import com.coderpage.mine.app.tally.common.error.ErrorCode;
-import com.coderpage.base.cache.Cache;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -153,6 +153,6 @@ List<File> listBackupFiles() {
         }
 
         File[] files = imageFolder.listFiles();
-        return Arrays.asList(files);
+        return files == null ? new ArrayList<>(0) : Arrays.asList(files);
     }
 }