Jelajahi Sumber

Fixed using same login callback uris for different app versions

Vadik Sirekanyan 5 tahun lalu
induk
melakukan
c6172dac2e

+ 8 - 0
app/build.gradle.kts

@@ -19,6 +19,14 @@ android {
         versionName = "0.3.1"
         setProperty("archivesBaseName", "$applicationId-$versionName-$versionCode")
         vectorDrawables.useSupportLibrary = true
+        manifestPlaceholders = mapOf(
+            "LOGIN_CALLBACK_SCHEME" to "e270636c0efc6cad95130113d3bbafc3",
+            "LOGIN_CALLBACK_HOST" to "532b8e7fc54c52b6df5b55181acc241a",
+            "LOGIN_CALLBACK_PATH" to "$versionCode"
+        )
+        manifestPlaceholders.forEach { (key, value) ->
+            buildConfigField("String", key, "\"$value\"")
+        }
     }
     buildTypes {
         getByName("release") {

+ 3 - 3
app/src/main/AndroidManifest.xml

@@ -65,9 +65,9 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="532b8e7fc54c52b6df5b55181acc241a"
-                    android:path="/8e89f82ac2a6a7972452eae93e3bb734"
-                    android:scheme="e270636c0efc6cad95130113d3bbafc3" />
+                    android:host="${LOGIN_CALLBACK_HOST}"
+                    android:path="/${LOGIN_CALLBACK_PATH}"
+                    android:scheme="${LOGIN_CALLBACK_SCHEME}" />
             </intent-filter>
         </activity>
 

+ 4 - 3
app/src/main/java/com/sirekanyan/knigopis/feature/login/constants.kt

@@ -1,13 +1,14 @@
 package com.sirekanyan.knigopis.feature.login
 
 import android.net.Uri
+import com.sirekanyan.knigopis.BuildConfig.*
 import com.sirekanyan.knigopis.common.extensions.RANDOM_ID
 
 val LOGIN_CALLBACK_URI: Uri =
     Uri.Builder()
-        .scheme("e270636c0efc6cad95130113d3bbafc3")
-        .authority("532b8e7fc54c52b6df5b55181acc241a")
-        .path("8e89f82ac2a6a7972452eae93e3bb734")
+        .scheme(LOGIN_CALLBACK_SCHEME)
+        .authority(LOGIN_CALLBACK_HOST)
+        .path(LOGIN_CALLBACK_PATH)
         .build()
 private val LOGIN_URI: Uri =
     Uri.Builder()