From de7e4fd31d14a43b98ffa26ceb2fae34e556151a Mon Sep 17 00:00:00 2001 From: Jason Dantuma Date: Mon, 3 Jun 2019 13:54:53 +0200 Subject: [PATCH] PMA-8255 - Final changes to SDK for new servlet changes --- .idea/misc.xml | 2 +- .../everlytic/android/pushnotificationsdk/EvLogger.kt | 4 ++-- .../android/pushnotificationsdk/EverlyticPush.kt | 2 +- .../android/pushnotificationsdk/models/ApiResponse.kt | 2 +- .../models/jsonadapters/ApiResponseAdapter.kt | 7 ++++--- .../pushnotificationsdk/network/EverlyticApi.kt | 10 +++++----- .../pushnotificationsdk/network/EverlyticHttp.kt | 4 ++-- .../main/java/com/everlytic/android/sandboxapp/App.kt | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 51fa3e5..cc04cd3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -35,7 +35,7 @@ - + diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EvLogger.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EvLogger.kt index e1341ed..461b827 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EvLogger.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EvLogger.kt @@ -7,9 +7,9 @@ import android.util.Log internal object EvLogger { fun d(tag: String, message: String? = null, throwable: Throwable? = null) { -// if (BuildConfig.DEBUG) { + if (BuildConfig.DEBUG) { Log.d(tag, message, throwable) -// } + } } fun i(tag: String, message: String? = null, throwable: Throwable? = null) { diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EverlyticPush.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EverlyticPush.kt index 04bc24d..c8d4729 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EverlyticPush.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/EverlyticPush.kt @@ -65,7 +65,7 @@ public object EverlyticPush { * Subscribes a contact email to Everlytic Push Notifications for the current device * @since 0.0.1-alpha * @param email - * @param onComplete Callback with result of attempted subscription + * @param onComplete Callback with status of attempted subscription * @return [Unit] * */ @JvmStatic diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/ApiResponse.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/ApiResponse.kt index 2fd736a..eb9c203 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/ApiResponse.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/ApiResponse.kt @@ -2,4 +2,4 @@ package com.everlytic.android.pushnotificationsdk.models import org.json.JSONObject -internal data class ApiResponse(var result: String, var data: JSONObject) \ No newline at end of file +internal data class ApiResponse(var status: String, var data: JSONObject) \ No newline at end of file diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/jsonadapters/ApiResponseAdapter.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/jsonadapters/ApiResponseAdapter.kt index 0737486..bcaeffb 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/jsonadapters/ApiResponseAdapter.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/models/jsonadapters/ApiResponseAdapter.kt @@ -1,19 +1,20 @@ package com.everlytic.android.pushnotificationsdk.models.jsonadapters +import com.everlytic.android.pushnotificationsdk.getJSONObjectOrNull import com.everlytic.android.pushnotificationsdk.models.ApiResponse import org.json.JSONObject internal object ApiResponseAdapter : JSONAdapterInterface { override fun toJson(obj: ApiResponse): JSONObject { return JSONObject() - .put("result", obj.result) + .put("status", obj.status) .put("data", obj.data) } override fun fromJson(json: JSONObject): ApiResponse { return ApiResponse( - json.getString("result"), - json.getJSONObject("data") + json.getString("status"), + json.getJSONObjectOrNull("data") ?: JSONObject() ) } diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticApi.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticApi.kt index db666ec..9e83aa9 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticApi.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticApi.kt @@ -9,7 +9,7 @@ internal class EverlyticApi(val http: EverlyticHttp) { fun subscribe(subscription: SubscriptionEvent, responseHandler: EverlyticHttp.ResponseHandler) { http.post( - "push-notifications/subscriptions/subscribe", + "push-notifications/subscribe", JSONAdapter.encodeAsString(subscription), responseHandler ) @@ -17,21 +17,21 @@ internal class EverlyticApi(val http: EverlyticHttp) { fun unsubscribe(unsubscribeEvent: UnsubscribeEvent, responseHandler: EverlyticHttp.ResponseHandler) { http.post( - "push-notifications/subscriptions/unsubscribe", + "push-notifications/unsubscribe", JSONAdapter.encodeAsString(unsubscribeEvent), responseHandler ) } fun recordClickEvent(event: NotificationEvent, responseHandler: EverlyticHttp.ResponseHandler) { - http.post("push-notifications/events/clicks", JSONAdapter.encodeAsString(event), responseHandler) + http.post("push-notifications/clicks", JSONAdapter.encodeAsString(event), responseHandler) } fun recordDeliveryEvent(event: NotificationEvent, responseHandler: EverlyticHttp.ResponseHandler) { - http.post("push-notifications/events/deliveries", JSONAdapter.encodeAsString(event), responseHandler) + http.post("push-notifications/deliveries", JSONAdapter.encodeAsString(event), responseHandler) } fun recordDismissEvent(event: NotificationEvent, responseHandler: EverlyticHttp.ResponseHandler) { - http.post("push-notifications/events/dismissals", JSONAdapter.encodeAsString(event), responseHandler) + http.post("push-notifications/dismissals", JSONAdapter.encodeAsString(event), responseHandler) } } \ No newline at end of file diff --git a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticHttp.kt b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticHttp.kt index cb229ae..a84652d 100644 --- a/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticHttp.kt +++ b/pushnotificationsdk/src/main/java/com/everlytic/android/pushnotificationsdk/network/EverlyticHttp.kt @@ -90,7 +90,7 @@ internal class EverlyticHttp(installUrl: String, pushProjectUuid: String) { val bytes = jsonBodyData.toByteArray() setFixedLengthStreamingMode(bytes.size) - logd("Writing data...") + logd("Writing data=${jsonBodyData}") outputStream.write(bytes) } @@ -139,7 +139,7 @@ internal class EverlyticHttp(installUrl: String, pushProjectUuid: String) { } else { val response = ApiResponseAdapter.fromJson(JSONObject(jsonResult)) - if (response.result == "error") { + if (response.status == "error") { responseHandler.onFailure(400, jsonResult, null) } else { responseHandler.onSuccess(response) diff --git a/sandboxapp/src/main/java/com/everlytic/android/sandboxapp/App.kt b/sandboxapp/src/main/java/com/everlytic/android/sandboxapp/App.kt index c83ff4b..0611da2 100644 --- a/sandboxapp/src/main/java/com/everlytic/android/sandboxapp/App.kt +++ b/sandboxapp/src/main/java/com/everlytic/android/sandboxapp/App.kt @@ -13,7 +13,7 @@ class App : Application() { FirebaseApp.initializeApp(this) EverlyticPush // .setInTestMode(true) - .init(this, "dT1hZG1pbmlzdHJhdG9yO2s9MlVvZXdYaXJSMEJPZVFHOGh1M1pFRHpLNnVXd0l5NHJfMDtpPWh0dHA6Ly9xYS5ldmVybHl0aWMubmV0O2w9NA==") + .init(this, "cD0zNjhhOGJmZS0yZjA1LTRmNjMtYjY3OS0yOWJhOTAyY2FmOWM7aT1odHRwOi8vcWEuZXZlcmx5dGljLm5ldA==") } } \ No newline at end of file