fix: if empty folder

Cap-go · Feb 15, 2022 · d7bf6d0 · d7bf6d0
1 parent a41e0d6
commit d7bf6d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java
@@ -107,18 +107,25 @@ private Boolean unzip(String source, String dest) {
             return true;
         }
     }
-    private void flattenAssets(String source, String dest) {
+    private Boolean flattenAssets(String source, String dest) {
         File current = new File(this.context.getFilesDir()  + "/" + source);
+        if (!current.exists()) {
+            return false;
+        }
         File fDest = new File(this.context.getFilesDir()  + "/" + dest);
         fDest.getParentFile().mkdirs();
         String[] pathsName = current.list();
+        if (pathsName == null || pathsName.length == 0) {
+            return false;
+        }
         if (pathsName.length == 1 && !pathsName[0].equals("index.html")) {
             File newFlat =  new File(current.getPath() + "/" + pathsName[0]);
             newFlat.renameTo(fDest);
         } else {
             current.renameTo(fDest);
         }
         current.delete();
+        return true;
     }
 
     private Boolean downloadFile(String url, String dest) throws JSONException {
@@ -168,7 +175,8 @@ public String download(String url) {
             Boolean unzipped = this.unzip(folderNameZip, folderNameUnZip);
             if(!unzipped) return null;
             fileZip.delete();
-            this.flattenAssets(folderNameUnZip, folderName);
+            Boolean flatt = this.flattenAssets(folderNameUnZip, folderName);
+            if(!flatt) return null;
             return version;
         } catch (Exception e) {
             Log.e(TAG, "updateApp error", e);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capacitor-updater",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "license": "AGPL-3.0-only",
   "description": "Download app update from url",
   "main": "dist/plugin.cjs.js",