From 32a6ef825e40680cac96ef00ea658f5bfd70d603 Mon Sep 17 00:00:00 2001
From: EddyVerbruggen <eddyverbruggen@gmail.com>
Date: Sun, 7 Jul 2019 17:15:06 +0200
Subject: [PATCH] Files written to the file-system are lost after update #20

---
 demo/appresources/Android/AndroidManifest.xml |   4 +-
 demo/appresources/iOS/Info.plist              |   4 +-
 demo/demoapp/main-page.xml                    |  18 ++++---
 demo/demoapp/main-view-model.ts               |  45 +++++++++++++++++-
 demo/package.json                             |   2 +-
 src/package.json                              |   2 +-
 src/platforms/android/tnsappsync.aar          | Bin 4486 -> 4529 bytes
 src/platforms/android_lib/README.md           |   6 +--
 .../src/main/java/com/tns/TNSAppSync.java     |  25 +++++-----
 .../android_lib/tnsappsync/tnsappsync.iml     |   4 +-
 10 files changed, 80 insertions(+), 30 deletions(-)

diff --git a/demo/appresources/Android/AndroidManifest.xml b/demo/appresources/Android/AndroidManifest.xml
index 4502676..6ce39fd 100644
--- a/demo/appresources/Android/AndroidManifest.xml
+++ b/demo/appresources/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="__PACKAGE__"
-	android:versionCode="1"
-	android:versionName="1.0.0">
+	android:versionCode="2"
+	android:versionName="1.1.0">
 
 	<supports-screens
 		android:smallScreens="true"
diff --git a/demo/appresources/iOS/Info.plist b/demo/appresources/iOS/Info.plist
index fbc42ee..e7a386d 100644
--- a/demo/appresources/iOS/Info.plist
+++ b/demo/appresources/iOS/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
diff --git a/demo/demoapp/main-page.xml b/demo/demoapp/main-page.xml
index 1c0dcfd..84f3d93 100644
--- a/demo/demoapp/main-page.xml
+++ b/demo/demoapp/main-page.xml
@@ -1,11 +1,17 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" class="page">
-  <StackLayout class="p-20">
+    <StackLayout class="p-20">
 
-<!--    <Label text="I'm AppSync iOS" class="t-20 text-center c-orange" textWrap="true"/>-->
-<!--    <Label text="I'm AppSync Android (mandatory)" class="t-20 text-center c-orange" textWrap="true"/>-->
-    <Label text="I'm the APPSTORE version.." class="t-20 text-center c-orange" textWrap="true"/>
+<!--        <Label text="I'm AppSync iOS" class="t-20 text-center c-orange" textWrap="true"/>-->
+<!--        <Label text="I'm AppSync Android (mandatory)" class="t-20 text-center c-orange" textWrap="true"/>-->
+        <Label text="I'm the APPSTORE version.." class="t-20 text-center c-orange" textWrap="true"/>
 
-    <Label text="{{ message }}" class="t-20 m-30 text-center c-black" textWrap="true"/>
-  </StackLayout>
+        <Label text="{{ message }}" class="t-20 m-30 text-center c-black" textWrap="true"/>
+
+        <Button tap="{{ setAppSettings }}" text="set appsettings"/>
+        <Button tap="{{ getAppSettings }}" text="get appsettings"/>
+
+        <Button tap="{{ setFileSystem }}" text="set filesystem"/>
+        <Button tap="{{ getFileSystem }}" text="get filesystem"/>
+    </StackLayout>
 
 </Page>
\ No newline at end of file
diff --git a/demo/demoapp/main-view-model.ts b/demo/demoapp/main-view-model.ts
index a975bbb..be39dbd 100644
--- a/demo/demoapp/main-view-model.ts
+++ b/demo/demoapp/main-view-model.ts
@@ -1,11 +1,18 @@
 import { AppSync, InstallMode, SyncStatus } from "nativescript-app-sync";
 import * as application from "tns-core-modules/application";
+import * as appSettings from "tns-core-modules/application-settings";
+import { knownFolders } from "tns-core-modules/file-system" ;
 import { Observable } from "tns-core-modules/data/observable";
 import { isIOS } from "tns-core-modules/platform";
 
+const documents = knownFolders.documents();
+const txtFile = documents.getFile("/app/something.txt");
+
 export class HelloWorldModel extends Observable {
   private appSync: AppSync;
 
+  private static APPSETTINGS_KEY = "appsettings_key";
+
   private static APPSYNC_IOS_STAGING_KEY = "QA5daorV624ZP3p0FbFkngdZasME4ksvOXqog";
   private static APPSYNC_IOS_PRODUCTION_KEY = "rOw06mG4jrWfU8wkoKY7WHM2LhVa4ksvOXqog";
 
@@ -24,6 +31,42 @@ export class HelloWorldModel extends Observable {
     });
   }
 
+  public setAppSettings() {
+    const d = new Date();
+    appSettings.setString(HelloWorldModel.APPSETTINGS_KEY, "AppSettings value set at " + d);
+    this.set("message", "Written date to AppSettings: " + d);
+  }
+
+  public getAppSettings() {
+    this.set("message", appSettings.getString(HelloWorldModel.APPSETTINGS_KEY));
+  }
+
+  public setFileSystem() {
+    const d = new Date();
+    txtFile.writeText("FileSystem value set at " + d)
+        .then(() => {
+          const value = "Written date to " + txtFile.path + ": " + d;
+          this.set("message", value);
+          console.log(value);
+        })
+        .catch(err => {
+          this.set("message", "Error writing to " + txtFile.path + ": " + err);
+          console.log("Error writing to " + txtFile.path + ": " + err);
+        });
+  }
+
+  public getFileSystem() {
+    txtFile.readText()
+        .then(content => {
+          this.set("message", "Got from " + txtFile.path + ": " + content);
+          console.log("Written to " + txtFile.path + ": " + content);
+        })
+        .catch(err => {
+          this.set("message", "Error reading from " + txtFile.path + ": " + err);
+          console.log("Error reading from " + txtFile.path + ": " + err);
+        });
+  }
+
   private syncWithAppSyncServer(): void {
     this.set("message", "Querying AppSync..");
     AppSync.sync({
@@ -46,4 +89,4 @@ export class HelloWorldModel extends Observable {
       }
     });
   }
-}
\ No newline at end of file
+}
diff --git a/demo/package.json b/demo/package.json
index 047d22a..0cebe29 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -31,7 +31,7 @@
     "ci.tslint": "npm i && tslint --config '../tslint.json' 'demoapp/**/*.ts' --exclude '**/node_modules/**' --exclude '**/typings/**'"
   },
   "dependencies": {
-    "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-1.0.1.tgz",
+    "nativescript-app-sync": "file:../publish/package/nativescript-app-sync-1.0.2.tgz",
     "nativescript-theme-core": "~1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~5.4.2"
diff --git a/src/package.json b/src/package.json
index 4571126..390e0d2 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-app-sync",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Use AppSync to hot deploy updates to your app.",
   "main": "app-sync",
   "typings": "index.d.ts",
diff --git a/src/platforms/android/tnsappsync.aar b/src/platforms/android/tnsappsync.aar
index 3cf2b04248eaf8346c6146c715f7d1f5690c43df..231b7e5339c680769a94f5d4b1a99fb121472533 100644
GIT binary patch
delta 4128
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

delta 4063
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
R000z|dl4`O!w>)f008lY{=EPI

diff --git a/src/platforms/android_lib/README.md b/src/platforms/android_lib/README.md
index d81d631..b12d0df 100644
--- a/src/platforms/android_lib/README.md
+++ b/src/platforms/android_lib/README.md
@@ -4,10 +4,10 @@ Using this wrapper to more easily copy some files around and (optionally) move s
 
 ### Building the framework
 - Clone this repo
-- Start Android Studio and pick 'open an existing project' > {this repo}/platforms/android_lib
+- Start Android Studio and pick "Open an existing Android Studio project" ➡️ `{this repo}/platforms/android_lib`
 - Update the `/src/main` folder as needed
 - Open the Gradle toolwindow
-- Run tnscodepush > Tasks > build > build
-- The (release) .aar will be generated in tnscodepush/build/outputs/aar
+- Run tnsappsync > Tasks > build > build
+- The (release) .aar will be generated in tnsappsync/build/outputs/aar
 - Copy that to the platforms/android folder, replacing the old .aar
 - Commit and push the changes as usual
\ No newline at end of file
diff --git a/src/platforms/android_lib/tnsappsync/src/main/java/com/tns/TNSAppSync.java b/src/platforms/android_lib/tnsappsync/src/main/java/com/tns/TNSAppSync.java
index a169e06..da8405b 100644
--- a/src/platforms/android_lib/tnsappsync/src/main/java/com/tns/TNSAppSync.java
+++ b/src/platforms/android_lib/tnsappsync/src/main/java/com/tns/TNSAppSync.java
@@ -44,19 +44,18 @@ static void activatePackage(final Context context) {
             }
         }
 
-        // move /app to /app_backup
-        final File appFolder = new File(context.getFilesDir().getPath() + "/app");
-
-        if (appFolder.renameTo(appBackupFolder)) {
-            // move pending to /app
-            if (pendingPackage.renameTo(appFolder)) {
-                // as long as the app wasn't restarted after an AppSync update, this key would exist to control JS behavior
-                removePendingHash(context);
-            } else {
-                // next to impossible, but just to be sure:
-                System.out.println("--- rename package to app failed");
-                appBackupFolder.renameTo(appFolder);
-            }
+        // copy /app to /app_backup (not renaming the folder, because we want to retain anything the app saved to the app folder at runtime)
+        // (example: if your app saves a file locally to /stuff/something.txt, it ends up as /data/user/0/org.nativescript.plugindemo.AppSync/files/stuff/something.txt)
+        try {
+            copyDirectoryContents(context.getFilesDir().getPath() + "/app", context.getFilesDir().getPath() + "/app_backup");
+
+            copyDirectoryContents(pendingPackagePath, context.getFilesDir().getPath() + "/app");
+
+            // as long as the app wasn't restarted after an AppSync update, this key would exist to control JS behavior
+            removePendingHash(context);
+        } catch (Exception e) {
+            System.out.println("--- installing app update failed: " + e.getMessage());
+            e.printStackTrace();
         }
     }
 
diff --git a/src/platforms/android_lib/tnsappsync/tnsappsync.iml b/src/platforms/android_lib/tnsappsync/tnsappsync.iml
index d7c9606..d4d5a24 100644
--- a/src/platforms/android_lib/tnsappsync/tnsappsync.iml
+++ b/src/platforms/android_lib/tnsappsync/tnsappsync.iml
@@ -17,6 +17,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
         <option name="PROJECT_TYPE" value="1" />
       </configuration>
@@ -97,7 +99,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
@@ -107,6 +108,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/reports" />