diff --git a/.idea/misc.xml b/.idea/misc.xml
index b153e48..71f92fa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,8 +3,44 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/FileBrowserView.iml b/FileBrowserView.iml
index 135c0f9..a4e4567 100644
--- a/FileBrowserView.iml
+++ b/FileBrowserView.iml
@@ -1,19 +1,19 @@
-
+
+
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9b8abe4..ef7ae5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.12.2'
+ classpath 'com.android.tools.build:gradle:2.2.2'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/demo-app/build.gradle b/demo-app/build.gradle
index c5cdaa4..1a22bfd 100644
--- a/demo-app/build.gradle
+++ b/demo-app/build.gradle
@@ -2,20 +2,20 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 20
- buildToolsVersion '20.0.0'
+ buildToolsVersion '21.0.0'
defaultConfig {
- applicationId 'com.psaravan.filebrowserview.demo'
+// applicationId 'com.psaravan.filebrowserview.demo'
minSdkVersion 14
targetSdkVersion 20
versionCode 1
versionName '1.0'
}
- buildTypes {
- release {
- runProguard false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
+// buildTypes {
+// release {
+// runProguard false
+// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+// }
+// }
productFlavors {
}
}
diff --git a/demo-app/demo-app.iml b/demo-app/demo-app.iml
new file mode 100644
index 0000000..cc8c8e0
--- /dev/null
+++ b/demo-app/demo-app.iml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..e73b0b3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Tue Jan 03 18:55:00 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 960734c..4483895 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -2,20 +2,20 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 20
- buildToolsVersion '20.0.0'
+ buildToolsVersion '21.0.0'
defaultConfig {
- applicationId 'com.psaravan.filebrowserview.lib'
+// applicationId 'com.psaravan.filebrowserview.lib'
minSdkVersion 14
targetSdkVersion 20
versionCode 1
versionName '1.0'
}
- buildTypes {
- release {
- runProguard false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- }
+// buildTypes {
+// release {
+// runProguard false
+// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+// }
+// }
productFlavors {
}
}
diff --git a/library/library.iml b/library/library.iml
index 87ab9e5..fb83c01 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -1,5 +1,5 @@
-
+
@@ -9,11 +9,12 @@
+
-
-
-
-
+
+
+ generateDebugSources
+
@@ -23,20 +24,25 @@
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -44,6 +50,15 @@
+
+
+
+
+
+
+
+
+
@@ -51,6 +66,7 @@
+
@@ -58,25 +74,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
+
@@ -87,5 +111,4 @@
-
-
+
\ No newline at end of file
diff --git a/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java b/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
index 991fe1c..51820ef 100644
--- a/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
+++ b/library/src/main/java/com/psaravan/filebrowserview/lib/FileBrowserEngine/FileBrowserEngine.java
@@ -131,7 +131,7 @@ public AdapterData loadDir(File directory) {
//Check if the file ends with an excluded extension.
String[] splits = path.split(".");
- if (mFileBrowserView.getFileExtensionFilter()
+ if (mFileBrowserView.getFileExtensionFilter()!=null&&mFileBrowserView.getFileExtensionFilter()
.getFilterMap()
.containsKey("." + splits[splits.length-1]))
continue;