Skip to content

Commit 96d73ad

Browse files
EddyVerbruggenEddyVerbruggen
committed
Gotta catch 'em all!
1 parent e18d25e commit 96d73ad

File tree

4 files changed

+33
-67
lines changed

4 files changed

+33
-67
lines changed

‎native-src/android/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Local Notifications Plugin library for NativeScript Android apps
22

33
## Building the framework
4-
- Import this folder as a gradle project in Android Studio
4+
- Open this folder as "an existing project" in Android Studio
55
- Change anything needed
6-
- In the Gradle build window run `app > build > clean` and `app > build > build`
7-
- Copy the release .aar: `cp native-src/android/app/build/outputs/aar/app-release.aar src/platforms/android/`
6+
- In the Gradle build window run `app > Tasks > build > clean` and `app > Tasks > build > build`
7+
- Copy the release .aar: from the project root, run: `cp native-src/android/app/build/outputs/aar/app-release.aar src/platforms/android/`

‎native-src/android/app/app.iml

Lines changed: 28 additions & 62 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=":app" />
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" />
@@ -84,74 +86,38 @@
8486
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8587
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8688
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_typedef_file" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations_zip" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compile_only_not_namespaced_r_class_jar" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/consumer_proguard_file" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_and_local_jars_jni" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_java_res" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_manifest" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_publish_jar" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_shaders" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-classes" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
117-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
118-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
119-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
120-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
121-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
122-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
123-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
89+
<excludeFolder url="file://$MODULE_DIR$/build" />
12490
</content>
12591
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
12692
<orderEntry type="sourceFolder" forTests="false" />
127-
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
93+
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
94+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
95+
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
96+
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
97+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
98+
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
99+
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
128100
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
129-
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
101+
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
130102
<orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
103+
<orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
104+
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
131105
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
132-
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
133-
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
134-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
135-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
136-
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
137-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
106+
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
138107
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
139-
<orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
108+
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
140109
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
141-
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
142-
<orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
143-
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
144-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
145-
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
110+
<orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
146111
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
112+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
113+
<orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
114+
<orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
115+
<orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
116+
<orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
117+
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
147118
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
148-
<orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
149-
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
150-
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
151-
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
152-
<orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
153-
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
119+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
120+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
154121
<orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
155-
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
156122
</component>
157123
</module>

‎native-src/android/app/src/main/java/com/telerik/localnotifications/NotificationAlarmReceiver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public void onReceive(Context context, Intent intent) {
2828
((NotificationManager) context
2929
.getSystemService(Context.NOTIFICATION_SERVICE))
3030
.notify(id, Builder.build(opts, context, id));
31-
} catch (NullPointerException e) {
32-
Log.e(TAG, "Notification could not be restored!" + e.getMessage(), e);
31+
} catch (Throwable t) {
32+
Log.e(TAG, "Notification could not be restored!" + t.getMessage(), t);
3333
}
3434

3535
// Note we don't unpersist this notification just yet, as it might still need to be restored

‎src/platforms/android/app-release.aar

-14 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)