Merge branch 'develop'

app/build.gradle

@@ -53,8 +53,8 @@ android {
 		applicationId "me.tagavari.airmessage"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionName "3.1.9"
-		versionCode 115
+		versionName "3.1.10"
+		versionCode 116
 
 		resConfigs "en", "fr", "ja"
 
@@ -130,22 +130,22 @@ dependencies {
 	testImplementation "junit:junit:4.13.2"
 	testImplementation "com.google.truth:truth:1.1.2"
 	testImplementation "com.google.truth.extensions:truth-java8-extension:1.1.2"
-	testImplementation "androidx.test:core:1.3.0"
+	testImplementation "androidx.test:core:1.4.0"
 	testImplementation "org.mockito:mockito-core:3.6.28"
 
-	androidTestImplementation "androidx.test.ext:truth:1.3.0"
-	androidTestImplementation "androidx.test:runner:1.3.0"
-	androidTestImplementation "androidx.test:rules:1.3.0"
+	androidTestImplementation "androidx.test.ext:truth:1.4.0"
+	androidTestImplementation "androidx.test:runner:1.4.0"
+	androidTestImplementation "androidx.test:rules:1.4.0"
 
 	//Android extensions
-	implementation "androidx.core:core-ktx:1.3.2"
+	implementation "androidx.core:core-ktx:1.6.0"
 	implementation "androidx.preference:preference-ktx:1.1.1"
 	implementation "androidx.browser:browser:1.3.0"
 	implementation "androidx.exifinterface:exifinterface:1.3.2"
 	implementation "androidx.security:security-crypto:1.0.0"
 
 	//Material components
-	implementation "com.google.android.material:material:1.3.0"
+	implementation "com.google.android.material:material:1.4.0"
 
 	//Android architecture components
 	def lifecycle_version = "2.3.1"
@@ -159,7 +159,7 @@ dependencies {
 
 	//ReactiveX
 	implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
-	implementation "io.reactivex.rxjava3:rxjava:3.0.12"
+	implementation "io.reactivex.rxjava3:rxjava:3.0.13"
 	implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
 
 	//Layouts and views
@@ -174,7 +174,7 @@ dependencies {
 	implementation "com.google.mlkit:smart-reply:16.1.1"
 
 	//Firebase
-	implementation platform("com.google.firebase:firebase-bom:28.0.1")
+	implementation platform("com.google.firebase:firebase-bom:28.1.0")
 
 	implementation "com.google.firebase:firebase-core"
 	implementation "com.google.firebase:firebase-messaging-ktx"
@@ -196,14 +196,14 @@ dependencies {
 
 	//Backend
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation "org.bouncycastle:bcprov-jdk15to18:1.68"
+	implementation "org.bouncycastle:bcprov-jdk15to18:1.69"
 
 	implementation "com.github.bumptech.glide:glide:4.12.0"
 	annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
 	implementation "jp.wasabeef:glide-transformations:4.3.0"
 
-	implementation "com.google.android.exoplayer:exoplayer-core:2.14.0"
-	implementation "com.google.android.exoplayer:exoplayer-ui:2.14.0"
+	implementation "com.google.android.exoplayer:exoplayer-core:2.14.1"
+	implementation "com.google.android.exoplayer:exoplayer-ui:2.14.1"
 
 	implementation "org.jsoup:jsoup:1.13.1"
 

app/src/main/java/me/tagavari/airmessage/connection/comm5/ProxyConnect.java

@@ -311,8 +311,8 @@ private static int webSocketToLocalCode(int code) {
 				return ConnectionErrorCode.connectNoCapacity;
 			case NHT.closeCodeAccountValidation:
 				return ConnectionErrorCode.connectAccountValidation;
-			case NHT.closeCodeNoSubscription:
-				return ConnectionErrorCode.connectNoSubscription;
+			case NHT.closeCodeNoActivation:
+				return ConnectionErrorCode.connectNoActivation;
 			case NHT.closeCodeOtherLocation:
 				return ConnectionErrorCode.connectOtherLocation;
 			default:
@@ -398,7 +398,7 @@ static class NHT {
 		static final int closeCodeNoCapacity = 4002; //The client's group is at capacity
 		static final int closeCodeAccountValidation = 4003; //This account couldn't be validated
 		static final int closeCodeServerTokenRefresh = 4004; //The server's provided installation ID is out of date; log in again to re-link this device
-		static final int closeCodeNoSubscription = 4005; //This user does not have an active subscription
+		static final int closeCodeNoActivation = 4005; //This user's account is not activated
 		static final int closeCodeOtherLocation = 4006; //Logged in from another location
 	}
 }

app/src/main/java/me/tagavari/airmessage/enums/ConnectionErrorCode.java

@@ -6,7 +6,7 @@
 import java.lang.annotation.RetentionPolicy;
 
 @Retention(RetentionPolicy.SOURCE)
-@IntDef({ConnectionErrorCode.user, ConnectionErrorCode.connection, ConnectionErrorCode.internet, ConnectionErrorCode.internalError, ConnectionErrorCode.externalError, ConnectionErrorCode.badRequest, ConnectionErrorCode.clientOutdated, ConnectionErrorCode.serverOutdated, ConnectionErrorCode.directUnauthorized, ConnectionErrorCode.connectNoGroup, ConnectionErrorCode.connectNoCapacity, ConnectionErrorCode.connectAccountValidation, ConnectionErrorCode.connectNoSubscription, ConnectionErrorCode.connectOtherLocation})
+@IntDef({ConnectionErrorCode.user, ConnectionErrorCode.connection, ConnectionErrorCode.internet, ConnectionErrorCode.internalError, ConnectionErrorCode.externalError, ConnectionErrorCode.badRequest, ConnectionErrorCode.clientOutdated, ConnectionErrorCode.serverOutdated, ConnectionErrorCode.directUnauthorized, ConnectionErrorCode.connectNoGroup, ConnectionErrorCode.connectNoCapacity, ConnectionErrorCode.connectAccountValidation, ConnectionErrorCode.connectNoActivation, ConnectionErrorCode.connectOtherLocation})
 public @interface ConnectionErrorCode {
 	//Standard result codes
 	int user = 0; //The user cancelled the connection
@@ -27,6 +27,6 @@
 	int connectNoGroup = 300;
 	int connectNoCapacity = 301;
 	int connectAccountValidation = 302;
-	int connectNoSubscription = 303;
+	int connectNoActivation = 303;
 	int connectOtherLocation = 304;
 }

app/src/main/java/me/tagavari/airmessage/helper/ErrorDetailsHelper.kt

@@ -76,8 +76,8 @@ object ErrorDetailsHelper {
 				labelRes = R.string.message_serverstatus_accountvalidation
 				if(!onlyConfig) button = ErrorDetails.Button(R.string.action_retry, actionReconnectService)
 			}
-			ConnectionErrorCode.connectNoSubscription -> {
-				labelRes = R.string.message_serverstatus_noenrollment
+			ConnectionErrorCode.connectNoActivation -> {
+				labelRes = R.string.message_serverstatus_noactivation
 				if(!onlyConfig) button = ErrorDetails.Button(R.string.action_retry, actionReconnectService)
 			}
 			ConnectionErrorCode.connectOtherLocation -> {

app/src/main/res/values-fr/strings.xml

@@ -488,8 +488,7 @@
 	<string name="message_serverstatus_nogroup">Votre serveur personnel n\'est pas disponible</string>
 	<string name="message_serverstatus_nocapacity">La limite de l\'appareil connecté a été atteinte</string>
 	<string name="message_serverstatus_accountvalidation">Le compte connecté ne peut pas être utilisé</string>
-<!--	<string name="message_serverstatus_nosubscription">Le compte connecté n\'est pas abonné</string>-->
-	<string name="message_serverstatus_noenrollment">Le compte connecté n\'est pas inscrit</string>
+	<string name="message_serverstatus_noactivation">Les nouveaux enregistrements sont désactivés</string>
 	<string name="message_serverstatus_otherlocation">L\'ordinateur serveur a été échangé</string>
 	<string name="message_serverstatus_nointernet">Pas de connexion Internet</string>
 	<string name="message_signinerror">Erreur de connexion</string>

app/src/main/res/values-ja/strings.xml

@@ -481,8 +481,7 @@
 	<string name="message_serverstatus_nogroup">パーソナルサーバーが接続されていません</string>
 	<string name="message_serverstatus_nocapacity">接続デバイスの制限に達しました</string>
 	<string name="message_serverstatus_accountvalidation">接続されたアカウントは使用できません</string>
-<!--	<string name="message_serverstatus_nosubscription">接続されたアカウントは登録されていません</string>-->
-	<string name="message_serverstatus_noenrollment">接続されたアカウントは登録されていません</string>
+	<string name="message_serverstatus_noactivation">新規登録はできません</string>
 	<string name="message_serverstatus_otherlocation">サーバーコンピュータが交換されました</string>
 	<string name="message_serverstatus_nointernet">インターネットに接続できません</string>
 	<string name="message_reset_connect">AirMessage からログアウトしますか？</string>

app/src/main/res/values/strings.xml

@@ -194,8 +194,7 @@
 	<string name="message_serverstatus_nogroup">Personal server not available</string>
 	<string name="message_serverstatus_nocapacity">Connected device limit reached</string>
 	<string name="message_serverstatus_accountvalidation">Connected account can\'t be used</string>
-<!--	<string name="message_serverstatus_nosubscription">Connected account isn\'t subscribed</string>-->
-	<string name="message_serverstatus_noenrollment">Connected account isn\'t enrolled</string>
+	<string name="message_serverstatus_noactivation">New registrations are unavailable</string>
 	<string name="message_serverstatus_otherlocation">Server computer swapped</string>
 	<string name="message_serverstatus_unknown">An unknown error occurred</string>
 

build.gradle

@@ -1,11 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-	ext.kotlin_version = "1.5.0"
-	ext.aboutlibs_version = "8.8.5"
+	ext.kotlin_version = "1.5.20"
+	ext.aboutlibs_version = "8.9.0"
 
 	repositories {
-		jcenter()
 		google()
 		mavenCentral()
 		maven {
@@ -14,8 +13,8 @@ buildscript {
 	}
 	dependencies {
 		classpath "com.android.tools.build:gradle:4.1.3"
-		classpath "com.google.gms:google-services:4.3.5"
-		classpath "com.google.firebase:firebase-crashlytics-gradle:2.6.0"
+		classpath "com.google.gms:google-services:4.3.8"
+		classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.1"
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 		classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutlibs_version"
 
@@ -26,7 +25,6 @@ buildscript {
 
 allprojects {
 	repositories {
-		jcenter()
 		google()
 		mavenCentral()
 	}