see 07/04 log

Blankj · Blankj · commit 3dfa55e89d3e · 2018-07-04T11:04:12.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -53,8 +53,8 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$support_version"
     implementation "com.android.support:design:$support_version"
     implementation 'com.r0adkll:slidableactivity:2.0.5'
-    // LeakCanary
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    // LeakCanary
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary_version"
 //    implementation 'com.blankj:utilcode:1.17.2'
diff --git a/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java b/app/src/main/java/com/blankj/androidutilcode/feature/core/permission/PermissionActivity.java
@@ -82,7 +82,7 @@ public void onWidgetClick(View view) {
                 PermissionUtils.launchAppDetailsSettings();
                 break;
             case R.id.btn_request_calendar:
-                PermissionUtils.permission(PermissionConstants.PHONE, PermissionConstants.STORAGE)
+                PermissionUtils.permission(PermissionConstants.CALENDAR)
                         .rationale(new PermissionUtils.OnRationaleListener() {
                             @Override
                             public void rationale(final ShouldRequest shouldRequest) {
diff --git a/subutil/build.gradle b/subutil/build.gradle
@@ -12,7 +12,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            consumerProguardFiles 'proguard-rules.pro'
+//            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/utilcode/build.gradle b/utilcode/build.gradle
@@ -12,7 +12,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            consumerProguardFiles 'proguard-rules.pro'
+//            consumerProguardFiles 'proguard-rules.pro'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ThreadUtils.java
@@ -4,6 +4,7 @@
 import android.os.Looper;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import java.util.Map;
@@ -993,9 +994,10 @@ public Task() {
             state = NEW;
         }
 
+        @Nullable
         public abstract T doInBackground() throws Throwable;
 
-        public abstract void onSuccess(T result);
+        public abstract void onSuccess(@Nullable T result);
 
         public abstract void onCancel();
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ android {`
`12`	`12`	`buildTypes {`
`13`	`13`	`release {`
`14`	`14`	`minifyEnabled false`
`15`		`- consumerProguardFiles 'proguard-rules.pro'`
	`15`	`+// consumerProguardFiles 'proguard-rules.pro'`
`16`	`16`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`17`	`17`	`}`
`18`	`18`	`}`