Merge branch 'release/1.2.2' into main

mouredev · Oct 7, 2021 · 8cb8609 · 8cb8609
2 parents ec8fd42 + b0f0f8b
commit 8cb8609
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 37 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.mouredev.twitimer"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 13
-        versionName "1.2.1"
+        versionCode 14
+        versionName "1.2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/com/mouredev/twitimer/model/session/Session.kt b/app/src/main/java/com/mouredev/twitimer/model/session/Session.kt
@@ -110,19 +110,17 @@ class Session {
                         success()
                     }, true)
                 })
-            }, failure)
+            }, failure, failure)
         }, failure)
     }
 
     fun revoke(context: Context, success: () -> Unit) {
 
         token?.accessToken?.let { accessToken ->
             TwitchService.revoke(accessToken, {
-                clear(context)
-                success()
+                clear(context, success)
             }, {
-                clear(context)
-                success()
+                clear(context, success)
             })
         }
     }
@@ -213,6 +211,11 @@ class Session {
                 reloadUser(context, completion, true)
             }, {
                 reloadUser(context, completion)
+            }, {
+                clear(context) {
+                    PreferencesProvider.set(context, PreferencesKey.ONBOARDING, true)
+                    completion()
+                }
             })
         }
     }
@@ -504,7 +507,7 @@ class Session {
         }
     }
 
-    private fun clear(context: Context) {
+    private fun clear(context: Context, completion: (() -> Unit)) {
 
         user?.followedUsers?.forEach { user ->
             setupNotification(false, user)
@@ -521,10 +524,10 @@ class Session {
 
         // Firebase Auth
         FirebaseAuth.getInstance().signOut()
-        firebaseAuth(context)
+        firebaseAuth(context, completion)
     }
 
-    private fun firebaseAuth(context: Context, completion: (() -> Unit)? = null) {
+    private fun firebaseAuth(context: Context, completion: (() -> Unit)) {
 
         // Firebase auth anónima y permanente para poder realizar operaciones autenticadas contra Firebase
         // TODO: Intentar integrar Twitch como sistema OAuth personalizado en Firebase
@@ -533,12 +536,12 @@ class Session {
                 authResult.user?.uid?.let { uid ->
                     PreferencesProvider.set(context, PreferencesKey.FIREBASE_AUTH_UID, uid)
                 }
-                completion?.invoke()
+                completion()
             }.addOnFailureListener {
-                completion?.invoke()
+                completion()
             }
         } else {
-            completion?.invoke()
+            completion()
         }
     }
 

diff --git a/app/src/main/java/com/mouredev/twitimer/provider/services/twitch/TwitchService.kt b/app/src/main/java/com/mouredev/twitimer/provider/services/twitch/TwitchService.kt
@@ -130,7 +130,7 @@ object TwitchService {
         })
     }
 
-    fun user(context: Context, success: (user: User) -> Unit, failure: () -> Unit, retry: Boolean = false) {
+    fun user(context: Context, success: (user: User) -> Unit, failure: () -> Unit, authFailure: () -> Unit, retry: Boolean = false) {
 
         val retrofit = Retrofit.Builder().baseUrl(TwitchServiceAPI.USER.baseUrl()).addConverterFactory(GsonConverterFactory.create()).build()
         val service = retrofit.create(TwitchAPIService::class.java)
@@ -141,13 +141,18 @@ object TwitchService {
                     success(user)
                 } ?: run {
                     val refreshToken = Session.instance.token?.refreshToken
-                    if (response.code() == AUTH_ERROR_STATUS_CODE && refreshToken != null && !retry) {
-                        refreshToken(context, refreshToken, success = {
-                            // Retry
-                            user(context, success, failure, true)
-                        }, failure = {
-                            failure()
-                        })
+                    if (response.code() == AUTH_ERROR_STATUS_CODE) {
+                        if (refreshToken != null && !retry) {
+                            refreshToken(context, refreshToken, success = {
+                                // Retry
+                                user(context, success, failure, authFailure, true)
+                            }, failure = {
+                                failure()
+                            })
+                        } else {
+                            // Close session
+                            authFailure()
+                        }
                     } else {
                         failure()
                     }

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip