From 3ea801c1130e41d9175d26f0af2fa1341663274f Mon Sep 17 00:00:00 2001 From: Xiaoyue Ma Date: Wed, 23 Oct 2024 17:08:14 -0700 Subject: [PATCH] Squash merge ttop-sdk/os_external into 2.3.1-release --- README.md | 6 +-- demo-auth/build.gradle | 2 +- demo-auth/src/main/AndroidManifest.xml | 9 +++- gradle.properties | 3 +- .../open/sdk/share/constants/Constants.kt | 50 ------------------- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 687447f2..cad98ec6 100644 --- a/README.md +++ b/README.md @@ -55,9 +55,9 @@ repositories { 5. Add the following implementation statement to the `dependencies{}` section: ```gradle dependencies { - implementation 'com.tiktok.open.sdk:tiktok-open-sdk-core:2.3.0' - implementation 'com.tiktok.open.sdk:tiktok-open-sdk-auth:2.3.0' // to use authorization api - implementation 'com.tiktok.open.sdk:tiktok-open-sdk-share:2.3.0' // to use share api + implementation 'com.tiktok.open.sdk:tiktok-open-sdk-core:2.2.0' + implementation 'com.tiktok.open.sdk:tiktok-open-sdk-auth:2.2.0' // to use authorization api + implementation 'com.tiktok.open.sdk:tiktok-open-sdk-share:2.2.0' // to use share api } ``` diff --git a/demo-auth/build.gradle b/demo-auth/build.gradle index b51190b6..4dcc6154 100644 --- a/demo-auth/build.gradle +++ b/demo-auth/build.gradle @@ -15,7 +15,7 @@ android { versionCode 1 versionName "1.0" buildConfigField "String", "CLIENT_KEY", '"awp9h9mdmo510fct"' - buildConfigField "String", "REDIRECT_URL", '"demoapp://oauthresponse"' + buildConfigField "String", "REDIRECT_URL", '"https://open-platform.tiktokapis.com/callback"' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/demo-auth/src/main/AndroidManifest.xml b/demo-auth/src/main/AndroidManifest.xml index 600e22c4..5704dd77 100644 --- a/demo-auth/src/main/AndroidManifest.xml +++ b/demo-auth/src/main/AndroidManifest.xml @@ -30,11 +30,16 @@ - + + - + + diff --git a/gradle.properties b/gradle.properties index 3f033b69..7171f283 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,8 @@ android.useAndroidX=true android.enableJetifier=true ARTIFACT_GROUP = com.tiktok.open.sdk -ARTIFACT_VERSION = 2.3.0 +ARTIFACT_VERSION = 2.3.1 + # core module CORE_ARTIFACT_ID = tiktok-open-sdk-core diff --git a/tiktok-open-sdk-share/src/main/java/com/tiktok/open/sdk/share/constants/Constants.kt b/tiktok-open-sdk-share/src/main/java/com/tiktok/open/sdk/share/constants/Constants.kt index c97b59bc..2a6b081f 100644 --- a/tiktok-open-sdk-share/src/main/java/com/tiktok/open/sdk/share/constants/Constants.kt +++ b/tiktok-open-sdk-share/src/main/java/com/tiktok/open/sdk/share/constants/Constants.kt @@ -105,53 +105,3 @@ internal object OneLinkConstants { const val TIKTOK_T_PLAYSTORE_ENDPOINT = "/BAuo/4az84vxo" const val TIKTOK_M_PLAYSTORE_ENDPOINT = "/bIdt/ikk538qj" } - -internal object ShareErrorCodes { - const val SUCCESS = 0 - const val UNKNOWN = -1 - - /** - * App certificate does not match configurations - * */ - - const val CONFIGURATION_ERR = 10011 - /** - * Illegal authorization scope. - * */ - const val SCOPE_ERR = 10004 - - /** - * Params parsing error. - * */ - const val PARAMETER_PARSE_ERR = 20002 - - /** - * "TikTok has no album permissions." - * */ - const val GALLERY_PERMISSION_ERR = 20005 - - /** - * TikTok Network error - * */ - const val NETWORK_ERR = 20006 - - /** - * Photo doesn't meet requirements. - * */ - const val INVALID_PHOTO_ERR = 20008 - - /** - * Processing photo resources failed. - * */ - const val PHOTO_RESOURCE_ERR = 20010 - - /** - * Video format is not supported. - * */ - const val INVALID_VIDEO_TYPE_ERR = 20012 - - /** - * Users store shared content for draft or user accounts are not allowed to post videos - * */ - const val SAVE_TO_DRAFT_ERR = 20016 -}