Skip to content

Commit 26a5be4

Browse files
EddyVerbruggenEddyVerbruggen
committed
Prevent a crash on Android when the app is launched while the device is locked #36 
1 parent 42f0514 commit 26a5be4

File tree

5 files changed

+31
-51
lines changed

5 files changed

+31
-51
lines changed

‎src/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-app-sync",
3-
"version": "1.0.4",
3+
"version": "1.0.5",
44
"description": "Use AppSync to hot deploy updates to your app.",
55
"main": "app-sync",
66
"typings": "index.d.ts",

‎src/platforms/android/tnsappsync.aar‎

39 Bytes
Binary file not shown.

‎src/platforms/android_lib/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Using this wrapper to more easily copy some files around and (optionally) move s
44

55
### Building the framework
66
- Clone this repo
7-
- Start Android Studio and pick "Open an existing Android Studio project" ➡️ `{this repo}/platforms/android_lib`
7+
- Start Android Studio and pick "Open an existing Android Studio project" ➡️ `{this repo}/src/platforms/android_lib`
88
- Update the `/src/main` folder as needed
99
- Open the Gradle toolwindow
1010
- Run tnsappsync > Tasks > build > build

‎src/platforms/android_lib/tnsappsync/src/main/java/com/tns/TNSAppSync.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ public class TNSAppSync {
2525

2626
// if AppSync/pending/app path exists, rename it to /app
2727
static void activatePackage(final Context context) {
28-
final String pendingPackagePath = getCurrentPackagePath(context);
28+
String pendingPackagePath = null;
29+
try {
30+
pendingPackagePath = getCurrentPackagePath(context);
31+
} catch (Exception e) {
32+
// This could be an IllegalStateException, fi. when the device is locked and the app is
33+
// started by a BroadCastListener, so sharedpreferences can't be read.
34+
}
35+
2936
if (pendingPackagePath == null) {
3037
return;
3138
}

‎src/platforms/android_lib/tnsappsync/tnsappsync.iml‎

Lines changed: 21 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":tnsappsync" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.4.1" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="3.4.1" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -33,14 +35,14 @@
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4446
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
@@ -49,71 +51,42 @@
4951
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5052
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5153
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5954
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
6055
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
6156
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
6257
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
6358
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
6459
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
6560
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6668
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6769
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6870
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6971
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
7072
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7173
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7274
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8277
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8378
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8479
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8580
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8681
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
88+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
11790
</content>
11891
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
11992
<orderEntry type="sourceFolder" forTests="false" />

0 commit comments

Comments
 (0)