Merge pull request #103 from metabrainz/update-credentials

Change redirect uri and update credentials
metabrainz · Dec 26, 2021 · f86515e · f86515e
2 parents c54635a + 16f5e40
commit f86515e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/org/metabrainz/android/data/sources/api/MusicBrainzServiceGenerator.kt b/app/src/main/java/org/metabrainz/android/data/sources/api/MusicBrainzServiceGenerator.kt
@@ -16,8 +16,8 @@ object MusicBrainzServiceGenerator {
     const val API_BASE_URL = "https://musicbrainz.org/ws/2/"
     const val AUTH_BASE_URL = "https://musicbrainz.org/oauth2/"
     const val ACOUST_ID_BASE_URL = "https://api.acoustid.org/v2/lookup"
-    const val CLIENT_ID = "BZn9PT8PXtzoUvR1ZIaXFw"
-    const val CLIENT_SECRET = "WN6o5cjehjPAP4dib0zOmQ"
+    const val CLIENT_ID = "DfX8Xv3B5Cbco8nZgd6KYMS504F3gmJx"
+    const val CLIENT_SECRET = "XypxMsphalFfTIh_IagjcsIlSKuUWoc-"
     const val OAUTH_REDIRECT_URI = "org.metabrainz.android://oauth"
     const val ACOUST_ID_KEY = "5mgEECwRkp"
 

diff --git a/app/src/main/java/org/metabrainz/android/presentation/features/login/LoginActivity.kt b/app/src/main/java/org/metabrainz/android/presentation/features/login/LoginActivity.kt
@@ -29,7 +29,7 @@ class LoginActivity : MusicBrainzActivity() {
         setContentView(binding!!.root)
         supportActionBar!!.setBackgroundDrawable(ColorDrawable(resources.getColor(R.color.app_bg)))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
-        loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
+        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
         loginViewModel!!.accessTokenLiveData!!.observe(this) { accessToken: AccessToken? ->
             saveOAuthToken(accessToken)
         }
@@ -47,8 +47,7 @@ class LoginActivity : MusicBrainzActivity() {
 
     override fun onResume() {
         val callbackUri = intent.data
-        if (callbackUri != null &&
-                callbackUri.toString().startsWith(MusicBrainzServiceGenerator.OAUTH_REDIRECT_URI)) {
+        if (callbackUri != null && callbackUri.toString().startsWith(MusicBrainzServiceGenerator.OAUTH_REDIRECT_URI)) {
             val code = callbackUri.getQueryParameter("code")
             if (code != null) loginViewModel!!.fetchAccessToken(code)
         }