From 26a5be4f7f6520d5c461593fdcacdbbbdb62ac84 Mon Sep 17 00:00:00 2001 From: EddyVerbruggen Date: Sun, 1 Sep 2019 21:39:12 +0200 Subject: [PATCH] Prevent a crash on Android when the app is launched while the device is locked #36 --- src/package.json | 2 +- src/platforms/android/tnsappsync.aar | Bin 4529 -> 4568 bytes src/platforms/android_lib/README.md | 2 +- .../src/main/java/com/tns/TNSAppSync.java | 9 ++- .../android_lib/tnsappsync/tnsappsync.iml | 69 ++++++------------ 5 files changed, 31 insertions(+), 51 deletions(-) diff --git a/src/package.json b/src/package.json index 336ebc4..1293b57 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-app-sync", - "version": "1.0.4", + "version": "1.0.5", "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 231b7e5339c680769a94f5d4b1a99fb121472533..51d8d9913eed14edd86740a8534265f4e7f07c41 100644 GIT binary patch delta 4142 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 delta 4102 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 E01@8}6#xJL diff --git a/src/platforms/android_lib/README.md b/src/platforms/android_lib/README.md index b12d0df..43e3625 100644 --- a/src/platforms/android_lib/README.md +++ b/src/platforms/android_lib/README.md @@ -4,7 +4,7 @@ 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 Android Studio project" ➡️ `{this repo}/platforms/android_lib` +- Start Android Studio and pick "Open an existing Android Studio project" ➡️ `{this repo}/src/platforms/android_lib` - Update the `/src/main` folder as needed - Open the Gradle toolwindow - Run tnsappsync > Tasks > build > build 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 da8405b..5bce5c3 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 @@ -25,7 +25,14 @@ public class TNSAppSync { // if AppSync/pending/app path exists, rename it to /app static void activatePackage(final Context context) { - final String pendingPackagePath = getCurrentPackagePath(context); + String pendingPackagePath = null; + try { + pendingPackagePath = getCurrentPackagePath(context); + } catch (Exception e) { + // This could be an IllegalStateException, fi. when the device is locked and the app is + // started by a BroadCastListener, so sharedpreferences can't be read. + } + if (pendingPackagePath == null) { return; } diff --git a/src/platforms/android_lib/tnsappsync/tnsappsync.iml b/src/platforms/android_lib/tnsappsync/tnsappsync.iml index 622db22..d301642 100644 --- a/src/platforms/android_lib/tnsappsync/tnsappsync.iml +++ b/src/platforms/android_lib/tnsappsync/tnsappsync.iml @@ -4,6 +4,8 @@ @@ -33,14 +35,14 @@ - - + + - - + + @@ -49,13 +51,6 @@ - - - - - - - @@ -63,6 +58,13 @@ + + + + + + + @@ -70,13 +72,6 @@ - - - - - - - @@ -84,36 +79,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + +