diff --git a/.classpath b/.classpath
index b46797c..15dd90e 100644
--- a/.classpath
+++ b/.classpath
@@ -3,18 +3,19 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
diff --git a/android/README.md b/android/README.md
index 5e3dd13..cbb9ad6 100644
--- a/android/README.md
+++ b/android/README.md
@@ -153,6 +153,12 @@ If you want to change the background color of the notification circle, override
* The current implementation only works in combination with [Facebook module](https://github.com/appcelerator-modules/ti.facebook) version 5.0.0 provided by [Appcelerator](https://github.com/appcelerator). That Facebook module also has a dependency onto the Boltz framework. Both modules should depend on the same version!
## Changelog
+**[v0.15.0](https://github.com/timanrebel/Parse/releases/tag/0.15.0)**
+- Applied Parse Android SDK 1.14.1
+
+**[v0.14.1](https://github.com/timanrebel/Parse/releases/tag/0.14.1)**
+- Rebuilding for Titanium SDK 6.0.0+
+
**[v0.13.1](https://github.com/timanrebel/Parse/releases/tag/0.13.1)**
- Add silent push notification (when exist 'content-available' or omitted 'title'&'alert')
- Add notification clear method : notificationClear()
diff --git a/android/build.properties b/android/build.properties
index dd24c96..102c2fc 100644
--- a/android/build.properties
+++ b/android/build.properties
@@ -1,4 +1,4 @@
-titanium.platform=/Users/InGrowth/Library/Application Support/Titanium/mobilesdk/osx/6.0.0.GA/android
-android.platform=/Users/InGrowth/Library/android-sdk-macosx/platforms/android-23
-google.apis=/Users/InGrowth/Library/android-sdk-macosx/add-ons/addon-google_apis-google-23
-android.ndk=/Users/InGrowth/Library/android-sdk-macosx/ndk-bundle
\ No newline at end of file
+titanium.platform=/Users/ingrowth/Library/Application Support/Titanium/mobilesdk/osx/6.0.0.GA/android
+android.platform=/Users/ingrowth/Library/android-sdk-macosx/platforms/android-23
+google.apis=/Users/ingrowth/Library/android-sdk-macosx/add-ons/addon-google_apis-google-23
+android.ndk=/Users/ingrowth/Library/android-sdk-macosx/ndk-bundle
\ No newline at end of file
diff --git a/android/java-sources.txt b/android/java-sources.txt
index 69e447d..0cfb4b1 100644
--- a/android/java-sources.txt
+++ b/android/java-sources.txt
@@ -1,3 +1,3 @@
-"/Users/InGrowth/Documents/Projects/Ti-Parse/android/build/generated/java/eu/rebelcorp/parse/ParseBootstrap.java"
-"/Users/InGrowth/Documents/Projects/Ti-Parse/android/src/eu/rebelcorp/parse/ParseModule.java"
-"/Users/InGrowth/Documents/Projects/Ti-Parse/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java"
\ No newline at end of file
+"/Users/ingrowth/Documents/Projects/Ti-Parse/android/build/generated/java/eu/rebelcorp/parse/ParseBootstrap.java"
+"/Users/ingrowth/Documents/Projects/Ti-Parse/android/src/eu/rebelcorp/parse/ParseModule.java"
+"/Users/ingrowth/Documents/Projects/Ti-Parse/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java"
\ No newline at end of file
diff --git a/android/lib/Parse-1.13.0.jar b/android/lib/Parse-1.13.0.jar
deleted file mode 100644
index ef4c4a6..0000000
Binary files a/android/lib/Parse-1.13.0.jar and /dev/null differ
diff --git a/android/lib/ParseInterceptors-0.0.2.jar b/android/lib/ParseInterceptors-0.0.2.jar
deleted file mode 100644
index 2b678c6..0000000
Binary files a/android/lib/ParseInterceptors-0.0.2.jar and /dev/null differ
diff --git a/android/lib/okhttp-3.6.0.jar b/android/lib/okhttp-3.6.0.jar
new file mode 100644
index 0000000..e6e4518
Binary files /dev/null and b/android/lib/okhttp-3.6.0.jar differ
diff --git a/android/lib/okio-1.11.0.jar b/android/lib/okio-1.11.0.jar
new file mode 100644
index 0000000..d6563e2
Binary files /dev/null and b/android/lib/okio-1.11.0.jar differ
diff --git a/android/lib/parse-android-1.14.1.jar b/android/lib/parse-android-1.14.1.jar
new file mode 100644
index 0000000..ef3d6a8
Binary files /dev/null and b/android/lib/parse-android-1.14.1.jar differ
diff --git a/android/libs/armeabi-v7a/libeu.rebelcorp.parse.so b/android/libs/armeabi-v7a/libeu.rebelcorp.parse.so
index f240f58..207492d 100644
Binary files a/android/libs/armeabi-v7a/libeu.rebelcorp.parse.so and b/android/libs/armeabi-v7a/libeu.rebelcorp.parse.so differ
diff --git a/android/libs/x86/libeu.rebelcorp.parse.so b/android/libs/x86/libeu.rebelcorp.parse.so
index f450bcc..18ea59f 100644
Binary files a/android/libs/x86/libeu.rebelcorp.parse.so and b/android/libs/x86/libeu.rebelcorp.parse.so differ
diff --git a/android/manifest b/android/manifest
index 954cb6a..e0ef6c4 100644
--- a/android/manifest
+++ b/android/manifest
@@ -2,7 +2,7 @@
# this is your module manifest and used by Titanium
# during compilation, packaging, distribution, etc.
#
-version: 0.14.1
+version: 0.15.0
apiversion: 3
description: Titanium module wrapping the Parse Android SDK.
author: Timan Rebel
diff --git a/android/src/eu/rebelcorp/parse/.DS_Store b/android/src/eu/rebelcorp/parse/.DS_Store
deleted file mode 100644
index b5a6ff2..0000000
Binary files a/android/src/eu/rebelcorp/parse/.DS_Store and /dev/null differ
diff --git a/android/src/eu/rebelcorp/parse/ParseModule.java b/android/src/eu/rebelcorp/parse/ParseModule.java
index 8731022..d2d0719 100644
--- a/android/src/eu/rebelcorp/parse/ParseModule.java
+++ b/android/src/eu/rebelcorp/parse/ParseModule.java
@@ -130,7 +130,7 @@ public static ParseModule getInstance() {
public void start()
{
setState(STATE_RUNNING);
- // Track Push opens
+ // App opens analytics
ParseAnalytics.trackAppOpenedInBackground(TiApplication.getAppRootOrCurrentActivity().getIntent());
ParseInstallation.getCurrentInstallation().put("androidId", getAndroidId());
ParseInstallation.getCurrentInstallation().saveInBackground(new SaveCallback() {
@@ -195,7 +195,7 @@ public String getCurrentInstallationId() {
public String getObjectId() {
return ParseInstallation.getCurrentInstallation().getObjectId();
}
-
+
@Kroll.method
public void notificationClear() {
TiApplication context = TiApplication.getInstance();
diff --git a/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java b/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java
index f1e4d89..868c1da 100644
--- a/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java
+++ b/android/src/eu/rebelcorp/parse/ParseModuleBroadcastReceiver.java
@@ -35,6 +35,7 @@ public class ParseModuleBroadcastReceiver extends ParsePushBroadcastReceiver {
@Override
public void onPushOpen(Context context, Intent intent) {
Intent i = context.getPackageManager().getLaunchIntentForPackage(context.getApplicationContext().getPackageName());
+ // Push open analytics
ParseAnalytics.trackAppOpenedInBackground(intent);
/* Check if the app is running or in background. If not, just start the app and add the
@@ -71,7 +72,7 @@ public void onPushReceive(Context context, Intent intent) {
super.onPushReceive(context, intent);
return;
}
-
+
JSONObject pnData = new JSONObject(intent.getExtras().getString("com.parse.Data"));
KrollDict data = new KrollDict(pnData);
@@ -83,11 +84,11 @@ public void onPushReceive(Context context, Intent intent) {
}
return;
}
-
+
if (ParseModule.getInstance().getState() != ParseModule.STATE_DESTROYED) {
Log.d("onPushReceive", "App is in foreground; trigger event 'notificationreceive'");
- try {
+ try {
ParseModule.getInstance().fireEvent("notificationreceive", data);
} catch (Exception e) {
Log.d("onPushReceive", e.getMessage());
@@ -95,7 +96,7 @@ public void onPushReceive(Context context, Intent intent) {
} else {
Log.d("onPushReceive", "App is not alive; 'notificationreceive' won't be triggered");
}
-
+
// silent push
if (pnData.has("content-available") == false) {
super.onPushReceive(context, intent);
diff --git a/eu.rebelcorp.parse-android-0.15.0.zip b/eu.rebelcorp.parse-android-0.15.0.zip
new file mode 100644
index 0000000..10d6d76
Binary files /dev/null and b/eu.rebelcorp.parse-android-0.15.0.zip differ