Skip to content
This repository was archived by the owner on Aug 3, 2025. It is now read-only.

Commit 4523283

Browse files
darsh2darsh2
committed
Bug fix and update gradle version
1 parent 261edba commit 4523283

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.2'
8+
classpath 'com.android.tools.build:gradle:1.5.0'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎multipleimageselect/multipleimageselect.iml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -67,18 +67,21 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6868
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7172
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7273
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7374
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7678
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7779
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7981
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
8082
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8285
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8386
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8487
</content>

‎multipleimageselect/src/main/java/com/darsh/multipleimageselect/activities/AlbumSelectActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,10 @@ protected void onStop() {
217217
getContentResolver().unregisterContentObserver(observer);
218218
observer = null;
219219

220-
handler.removeCallbacksAndMessages(null);
221-
handler = null;
220+
if (handler != null) {
221+
handler.removeCallbacksAndMessages(null);
222+
handler = null;
223+
}
222224
}
223225

224226
@Override

‎sample/sample.iml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -65,23 +65,29 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6767
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex-instrumentation/1.0.1/jars" />
7173
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/multidex/1.0.1/jars" />
7274
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7376
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
7477
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/multi-dex" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
7579
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
7680
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
7781
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7882
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8085
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8186
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8287
</content>
8388
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
8489
<orderEntry type="sourceFolder" forTests="false" />
90+
<orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
8591
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
8692
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
8793
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />

0 commit comments

Comments
 (0)