Fixed bugs. Updated libraries

Play-Store-Mauricio-Togneri · Jul 2, 2016 · afd12e5 · afd12e5
1 parent 891ed40
commit afd12e5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 
 android
 {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24"
 
     defaultConfig
     {
         applicationId "com.mauriciotogneri.fileexplorer"
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.3"
     }
 
     signingConfigs
@@ -42,9 +42,9 @@ android
 
 dependencies
 {
-    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:support-v4:24.0.0'
 
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:design:24.0.0'
 
-    compile 'ch.acra:acra:4.8.5'
+    compile 'ch.acra:acra:4.9.0'
 }
diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java
@@ -193,7 +193,10 @@ else if (!lhs.isDirectory() && rhs.isDirectory())
 
             for (File file : files)
             {
-                result.add(new FileInfo(file));
+                if (file != null)
+                {
+                    result.add(new FileInfo(file));
+                }
             }
 
             return result;
@@ -249,7 +252,7 @@ public void onShare()
         {
             shareSingle(selectedItems.get(0));
         }
-        else
+        else if (!selectedItems.isEmpty())
         {
             shareMultiple(selectedItems);
         }

diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/FileInfo.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/utils/FileInfo.java
@@ -42,9 +42,11 @@ public List<FileInfo> files()
         {
             for (File currentFile : file.listFiles())
             {
-                FileInfo fileInfo = new FileInfo(currentFile);
-
-                result.addAll(fileInfo.files());
+                if (currentFile != null)
+                {
+                    FileInfo fileInfo = new FileInfo(currentFile);
+                    result.addAll(fileInfo.files());
+                }
             }
         }
         else
@@ -61,8 +63,11 @@ public boolean delete()
         {
             for (File currentFile : file.listFiles())
             {
-                FileInfo fileInfo = new FileInfo(currentFile);
-                fileInfo.delete();
+                if (currentFile != null)
+                {
+                    FileInfo fileInfo = new FileInfo(currentFile);
+                    fileInfo.delete();
+                }
             }
         }
 

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript
 
     dependencies
     {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ buildscript @@
         dependencies
         {
-            classpath 'com.android.tools.build:gradle:2.1.0'
+            classpath 'com.android.tools.build:gradle:2.1.2'
         }
     }
@@ Expand Down @@