Skip to content
This repository was archived by the owner on Feb 7, 2019. It is now read-only.

Commit f999648

Browse files
author
pzlatanov
committed
Min sdk version adjusted in manifest. A message is logged when errors with parsing push notification bundle to json. Jar file in platforms updated with newer build.
1 parent a0664fa commit f999648

6 files changed

Lines changed: 4 additions & 5 deletions

File tree

native-src/android/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package="com.example.pushplugin"
44
android:versionCode="1"
55
android:versionName="1.0">
6+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23"/>
67
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
78
<activity android:name="ACTIVITY_ENTRY_NAME"
89
android:label="@string/app_name">
-4.85 MB
Binary file not shown.

native-src/android/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
android.library=true
1414
# Project target.
15-
target=android-21
15+
target=android-23

native-src/android/pushplugin.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
1515
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
1616
</content>
17-
<orderEntry type="jdk" jdkName="Android API 21 Platform - 1.7" jdkType="Android SDK" />
17+
<orderEntry type="inheritedJdk" />
1818
<orderEntry type="sourceFolder" forTests="false" />
1919
<orderEntry type="library" name="google-play-services" level="project" />
2020
<orderEntry type="library" name="android-support-v4" level="project" />

native-src/android/src/com/telerik/pushplugin/PushPlugin.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.google.android.gms.gcm.GcmListenerService;
77
import org.json.JSONException;
88
import org.json.JSONObject;
9-
109
import java.util.Set;
1110

1211
/**
@@ -87,10 +86,9 @@ public static void executeOnMessageReceivedCallback(Bundle data) {
8786
Set<String> keys = data.keySet();
8887
for (String key : keys) {
8988
try {
90-
// json.put(key, bundle.get(key)); see edit below
9189
dataAsJson.put(key, JSONObject.wrap(data.get(key)));
9290
} catch(JSONException e) {
93-
// Log.d(TAG, "Error thrown: ", e.toStringu());
91+
Log.d(TAG, "Error thrown while parsing push notification data bundle to json: " + e.getMessage());
9492
//Handle exception here
9593
}
9694
}
891 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)