From 7206506ae78060d779dde71792054d8cf630d069 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Fri, 8 Sep 2023 13:23:41 +0400 Subject: [PATCH 1/3] Fix logout url extra encoding --- CHANGELOG.md | 3 +++ gradle.properties | 2 +- id/id/src/main/java/io/piano/android/id/PianoIdClient.kt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74df1f6..a08cc15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Piano SDK for Android +## v2.8.1-SNAPSHOT +* Fix bug with logout url + ## v2.8.0 * Add support for Piano Consents * Deprecated static methods of `PianoId` class, use instance methods diff --git a/gradle.properties b/gradle.properties index 6791182..63ed443 100755 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=2.8.0 +VERSION_NAME=2.8.1-SNAPSHOT GROUP=io.piano.android POM_DESCRIPTION=Piano SDK for Android diff --git a/id/id/src/main/java/io/piano/android/id/PianoIdClient.kt b/id/id/src/main/java/io/piano/android/id/PianoIdClient.kt index 73639e5..cef6c2f 100644 --- a/id/id/src/main/java/io/piano/android/id/PianoIdClient.kt +++ b/id/id/src/main/java/io/piano/android/id/PianoIdClient.kt @@ -131,7 +131,7 @@ class PianoIdClient internal constructor( @JvmOverloads fun signOut(accessToken: String, callback: PianoIdFuncCallback? = null) { val signOutCallback = callback ?: {} - api.signOut(hostUrl.newBuilder().encodedPath(SIGN_OUT_PATH).build().toString(), aid, accessToken) + api.signOut(hostUrl.resolve(SIGN_OUT_PATH).toString(), aid, accessToken) .enqueue(signOutCallback.asRetrofitCallback()) } From 701d646b5a5276cef6ae0a7ada21fd6504a4e6b5 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 18 Sep 2023 18:42:48 +0400 Subject: [PATCH 2/3] Fix calling evaluateJavascript on incorrect thread --- gradle/libs.versions.toml | 8 ++++---- .../java/io/piano/android/showhelper/BaseJsInterface.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d527fcf..55a3b12 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,22 +11,22 @@ moshiIR = "0.22.1" # AndroidX libraries compatLibrary = "1.6.1" androidxActivity = "1.7.2" -annotationsLibrary = "1.6.0" +annotationsLibrary = "1.7.0" fragmentLibrary = "1.6.1" materialLibrary = "1.9.0" -lifecycleLibrary = "2.6.1" +lifecycleLibrary = "2.6.2" prefsLibrary = "1.2.1" multidex = "2.0.1" # Third party Libraries facebookLogin = "16.2.0" -googlePlayServices = "20.6.0" +googlePlayServices = "20.7.0" retrofit = "2.9.0" okhttp = "4.11.0" moshi = "1.15.0" timber = "5.0.1" pianoConsents = "1.0.0" -cxense = "2.4.0" +cxense = "2.5.0" coroutines = "1.7.3" # Test Libraries diff --git a/show-helper/src/main/java/io/piano/android/showhelper/BaseJsInterface.kt b/show-helper/src/main/java/io/piano/android/showhelper/BaseJsInterface.kt index 53f3f4b..9d645a2 100644 --- a/show-helper/src/main/java/io/piano/android/showhelper/BaseJsInterface.kt +++ b/show-helper/src/main/java/io/piano/android/showhelper/BaseJsInterface.kt @@ -16,7 +16,7 @@ abstract class BaseJsInterface { val view = fragment?.webView ?: webView view?.also { val func = { it.evaluateJavascript(code, null) } - if (delay > 0) it.postDelayed(func, delay) else func() + if (delay > 0) it.postDelayed(func, delay) else it.post(func) } ?: Timber.w("We got null for webview") } } From 1bc33004592be9b56e601f9dd1c6ae9f31481d30 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 18 Sep 2023 19:11:23 +0400 Subject: [PATCH 3/3] Prepare release --- CHANGELOG.md | 11 ++++++++++- gradle.properties | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a08cc15..54e968e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ # Piano SDK for Android -## v2.8.1-SNAPSHOT +## v2.8.1 * Fix bug with logout url +* Fix bug with Javascript threads in Show Forms +* Updated dependencies: + - androidx.annotation:annotation [1.6.0 -> 1.7.0] + https://developer.android.com/jetpack/androidx/releases/annotation#1.7.0 + - androidx.lifecycle:lifecycle-common-java8 [2.6.1 -> 2.6.2] + https://developer.android.com/jetpack/androidx/releases/lifecycle#2.6.2 + - com.google.android.gms:play-services-auth [20.6.0 -> 20.7.0] + - io.piano.android:cxense [2.4.0 -> 2.5.0] ## v2.8.0 * Add support for Piano Consents @@ -51,6 +59,7 @@ https://github.com/square/retrofit - com.squareup.moshi:moshi [1.13.0 -> 1.14.0] https://github.com/square/moshi/ + - io.piano.android:cxense [2.3.1 -> 2.4.0] ## v2.6.2 * Fix getUserInfo API parser diff --git a/gradle.properties b/gradle.properties index 63ed443..feb0db8 100755 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -VERSION_NAME=2.8.1-SNAPSHOT +VERSION_NAME=2.8.1 GROUP=io.piano.android POM_DESCRIPTION=Piano SDK for Android