fix(commander): fix frontier login

corenting · Mar 4, 2023 · b9bf245 · b9bf245
1 parent c571816
commit b9bf245
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'kotlin-parcelize'
 
 android {
     compileSdkVersion 33
-    buildToolsVersion "33.0.1"
+    buildToolsVersion "33.0.2"
 
     defaultConfig {
         applicationId "fr.corenting.edcompanion"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 64
-        versionName "2.22.1"
+        versionCode 65
+        versionName "2.23"
         vectorDrawables.useSupportLibrary = true
 
         buildConfigField "String", "FRONTIER_AUTH_CLIENT_ID", '"' + FRONTIER_AUTH_CLIENT_ID + '"'
@@ -52,7 +52,7 @@ dependencies {
     // AndroidX
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -64,23 +64,23 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
 
     // Play services / Firebase
-    implementation platform('com.google.firebase:firebase-bom:31.1.1')
+    implementation platform('com.google.firebase:firebase-bom:31.2.3')
     implementation 'com.google.firebase:firebase-messaging-ktx'
-    implementation 'com.google.android.gms:play-services-base:18.1.0'
+    implementation 'com.google.android.gms:play-services-base:18.2.0'
 
     // Retrofit
     ext.retrofitVersion = '2.9.0'
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
 
     // Glide
-    ext.glideVersion = '4.14.2'
+    ext.glideVersion = '4.15.0'
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
 
     // Other
     implementation 'com.makeramen:roundedimageview:2.3.0'
-    implementation 'com.google.code.gson:gson:2.10'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.jakewharton.threetenabp:threetenabp:1.4.4'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'

diff --git a/app/src/main/java/fr/corenting/edcompanion/singletons/FrontierAuthSingleton.java b/app/src/main/java/fr/corenting/edcompanion/singletons/FrontierAuthSingleton.java
@@ -87,7 +87,7 @@ public String getAuthorizationUrl(Context ctx) {
 
         return ctx.getString(R.string.frontier_auth_base) + "auth" +
                 "?audience=all" +
-                "&scope=capi" +
+                "&scope=auth%20capi" +
                 "&response_type=code" +
                 "&state=" + requestState +
                 "&client_id=" + BuildConfig.FRONTIER_AUTH_CLIENT_ID +

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -346,10 +346,9 @@
     <string name="changelog_title">Changelog</string>
     <string name="changelog_message">
         <![CDATA[
-            <b>Version 2.22</b><br />
+            <b>Version 2.23</b><br />
             <ul>
-                <li>Update theme to Material 3</li><br />
-                <li>Fix some ships names in fleet tab</li><br />
+                <li>Fix commander tab login with Frontier API: the login was broken due a change in the API behavior</li><br />
             </ul>
         ]]>
     </string>

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.0'
 
     repositories {
         google()
@@ -10,8 +10,8 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.google.gms:google-services:4.3.15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

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-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip