1.1.0

vksdk · Dec 29, 2022 · 16b8a5f · 16b8a5f
1 parent 5de7c46
commit 16b8a5f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # VK SDK Android
-![cover](images/android_cover.png)
+![cover](docs/images/android_cover.png)
 
 <p align="center">Some Android-specific features built into Unofficial VK SDK for Android</p>
 
@@ -17,7 +17,7 @@ See the documentation: [https://vksdk.github.io/vk-sdk-android](https://vksdk.gi
 ## Auth
 [![Android minSdkVersion](https://img.shields.io/badge/minSdkVersion-21-yellowgreen)](https://img.shields.io/badge/minSdkVersion-16-yellowgreen) [![Android targetSdkVersion](https://img.shields.io/badge/targetSdkVersion-33-green)](https://img.shields.io/badge/targetSdkVersion-33-green)
 
-Latest version:  [![maven-central](https://img.shields.io/badge/Maven%20Central-1.0.0-yellowgreen?style=flat)](https://search.maven.org/search?q=g:com.petersamokhin.vksdk.android)
+Latest version:  [![maven-central](https://img.shields.io/badge/Maven%20Central-1.1.0-yellowgreen?style=flat)](https://search.maven.org/search?q=g:com.petersamokhin.vksdk.android)
 
 [Authorization code flow](https://vk.com/dev/authcode_flow_user) is not supported by the official VK SDK and by the official app.
 But it is supported by this auth feature.
@@ -41,10 +41,10 @@ val callback = { result: VkAuthResult ->
 }
 
 // before activity.onCreate
-VkAuth.register(activity, callback)
+val launcher = VkAuth.register(activity, callback)
 
 // somewhere onClick
-VkAuth.login(activity, params)
+VkAuth.login(activity, launcher, params)
 ```
 
 ## Install

diff --git a/auth/CHANGELOG.md b/auth/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change log
 
+Version 1.1.0 *(2022-12-29)*
+----------------------------
+
+* Expose the activity result launcher and take it as a param.
+* Fix `AuthMode.RequireWebView` ignored for `ResponseType.Code`.
+
 Version 1.0.1 *(2022-12-29)*
 ----------------------------
 

diff --git a/auth/gradle.properties b/auth/gradle.properties
@@ -1,4 +1,4 @@
 POM_ARTIFACT_ID=auth
 POM_NAME=VK SDK Android Auth
 POM_DESCRIPTION=VK SDK Android, module Auth
-VERSION_NAME=1.0.1
+VERSION_NAME=1.1.0
diff --git a/auth/src/main/kotlin/com/petersamokhin/vksdk/android/auth/VkAuth.kt b/auth/src/main/kotlin/com/petersamokhin/vksdk/android/auth/VkAuth.kt
@@ -24,7 +24,6 @@ import com.petersamokhin.vksdk.android.auth.error.VkAuthException
 import com.petersamokhin.vksdk.android.auth.model.VkAuthResult
 import com.petersamokhin.vksdk.android.auth.utils.toMap
 import kotlinx.parcelize.Parcelize
-import java.util.WeakHashMap
 
 /**
  * VK authorization handler.
@@ -52,8 +51,6 @@ public object VkAuth {
     private const val SERVICE_ACTION = "android.support.customtabs.action.CustomTabsService"
     private const val CHROME_PACKAGE = "com.android.chrome"
 
-    private var resultLaunchers: MutableMap<ComponentActivity, ActivityResultLauncher<Intent>> = WeakHashMap()
-
     /**
      * Register the given activity for auth result.
      * See [ComponentActivity.registerForActivityResult]
@@ -65,13 +62,8 @@ public object VkAuth {
     @JvmStatic
     public fun register(
         activity: ComponentActivity,
-        overrideLaunchersMap: MutableMap<ComponentActivity, ActivityResultLauncher<Intent>>? = null,
         listener: (Result<VkAuthResult>) -> Unit,
-    ) {
-        if (overrideLaunchersMap != null) {
-            resultLaunchers = overrideLaunchersMap.also { map -> map.putAll(resultLaunchers) }
-        }
-
+    ): ActivityResultLauncher<Intent> {
         activity.addOnNewIntentListener { intent ->
             try {
                 listener(
@@ -86,7 +78,7 @@ public object VkAuth {
             }
         }
 
-        val resultLauncher = activity.registerForActivityResult(
+        return activity.registerForActivityResult(
             /* contract = */ ActivityResultContracts.StartActivityForResult(),
         ) { result ->
             val vkResult = try {
@@ -105,22 +97,6 @@ public object VkAuth {
                 listener(Result.failure(VkAuthException("Failed to parse the VK auth result: $result")))
             }
         }
-        resultLaunchers[activity] = resultLauncher
-    }
-
-    /**
-     * Unregister the activity result listeners.
-     *
-     * @param activity An activity for which to unregister the listeners.
-     *                 If null, all listeners will be unregistered.
-     */
-    @JvmStatic
-    public fun unregister(activity: ComponentActivity? = null) {
-        if (activity != null) {
-            resultLaunchers.remove(activity)
-        } else {
-            resultLaunchers.clear()
-        }
     }
 
     /**
@@ -173,6 +149,7 @@ public object VkAuth {
     @JvmStatic
     public fun login(
         activity: ComponentActivity,
+        launcher: ActivityResultLauncher<Intent>,
         authParams: AuthParams,
         mode: AuthMode = AuthMode.Auto,
     ) {
@@ -223,26 +200,20 @@ public object VkAuth {
                 }
 
                 if (intent != null) {
-                    launchLogin(
-                        activity = activity,
-                        intent = intent,
-                    )
+                    launcher.launch(intent)
                 }
             }
 
             ResponseType.Code -> {
                 Log.w(LOG_TAG, INFO_RESPONSE_TYPE_NOT_SUPPORTED)
 
                 when {
-                    activity.customTabsSupported() -> {
+                    mode != AuthMode.RequireWebView && activity.customTabsSupported() -> {
                         activity.startActivity(loadCustomTabsAuthUrlIntent(authParams.asQuery()))
                     }
 
                     else -> {
-                        launchLogin(
-                            activity = activity,
-                            intent = VkAuthActivity.intent(activity, authParams),
-                        )
+                        launcher.launch(VkAuthActivity.intent(activity, authParams))
                     }
                 }
             }
@@ -365,10 +336,6 @@ public object VkAuth {
         }
     }
 
-    private fun launchLogin(activity: ComponentActivity, intent: Intent) {
-        resultLaunchers[activity]?.launch(intent)
-    }
-
     /**
      * Response type: access_token or code
      *

diff --git a/docs/auth.md b/docs/auth.md
@@ -32,13 +32,13 @@ The first param is `androidx.activity.ComponentActivity` (e.g. `androidx.appcomp
 class MainActivity : AppCompatActivity(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {
         // must be called before onCreate
-        VkAuth.register(this) { result ->
+        val launcher = VkAuth.register(this) { result ->
             Log.e("vk_auth", result.toString())
         }
         super.onCreate(savedInstanceState)
 
         someButton.setOnClickListener {
-            VkAuth.login(this, params)
+            VkAuth.login(this, launcher, params)
         }
     }
 }
@@ -82,6 +82,7 @@ You need to make a JSON file available here: `https://domain.com/.well-known/ass
 Make your auth activity (from where you will do the auth) discoverable:
 
 ```xml
+
 <activity android:name=".auth.YourAuthActivity" android:exported="true" android:launchMode="singleTop">
 
     <intent-filter android:autoVerify="true" tools:targetApi="m">
@@ -99,7 +100,7 @@ Make your auth activity (from where you will do the auth) discoverable:
 
 #### 4. Prepare your activity
 
-In your auth activity, just before `onCreate`, call `VkAuth.register(this)`.
+In your auth activity, just before `onCreate`, call `VkAuth.register(this)` and use the returned `ActivityResultLauncher`.
 
 #### Et voila!
 
@@ -179,7 +180,7 @@ val params = VkAuth.AuthParams(
     apiVersion = apiVersion,
 )
 
-VkAuth.login(activity, params, authMode)
+VkAuth.login(activity, launcher, params, authMode)
 ```
 
 Auth modes:
@@ -251,10 +252,10 @@ val callback = { result: VkAuthResult ->
 }
 
 // before activity.onCreate
-VkAuth.register(activity, callback)
+val launcher = VkAuth.register(activity, callback)
 
 // somewhere onClick
-VkAuth.login(activity, params)
+VkAuth.login(activity, launcher, params)
 ```
 
 Example for `Code`:
@@ -277,8 +278,8 @@ val callback = { result: VkAuthResult ->
 }
 
 // before activity.onCreate
-VkAuth.register(activity, callback)
+val launcher = VkAuth.register(activity, callback)
 
 // somewhere onClick
-VkAuth.login(activity, params)
+VkAuth.login(activity, launcher, params)
 ```
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.petersamokhin.vksdk.android
-VERSION_NAME=1.0.1
+VERSION_NAME=1.1.0
 
 REPOSITORY_URL_MAVEN_STAGING_DEFAULT=https://oss.sonatype.org/service/local/staging/deploy/maven2/
 REPOSITORY_URL_MAVEN_SNAPSHOT_DEFAULT=https://oss.sonatype.org/content/repositories/snapshots/