From 38b6ac5c72501f6f294d2ed75d43d7c6e14e22e1 Mon Sep 17 00:00:00 2001 From: Cole Feuer <13751213+tagavari@users.noreply.github.com> Date: Sat, 3 Jul 2021 07:54:59 -0400 Subject: [PATCH 1/3] Update no activation strings --- .../tagavari/airmessage/connection/comm5/ProxyConnect.java | 6 +++--- .../me/tagavari/airmessage/enums/ConnectionErrorCode.java | 4 ++-- .../me/tagavari/airmessage/helper/ErrorDetailsHelper.kt | 4 ++-- app/src/main/res/values-fr/strings.xml | 3 +-- app/src/main/res/values-ja/strings.xml | 3 +-- app/src/main/res/values/strings.xml | 3 +-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/me/tagavari/airmessage/connection/comm5/ProxyConnect.java b/app/src/main/java/me/tagavari/airmessage/connection/comm5/ProxyConnect.java index 18fbc09c..69b8be23 100644 --- a/app/src/main/java/me/tagavari/airmessage/connection/comm5/ProxyConnect.java +++ b/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 } } \ No newline at end of file diff --git a/app/src/main/java/me/tagavari/airmessage/enums/ConnectionErrorCode.java b/app/src/main/java/me/tagavari/airmessage/enums/ConnectionErrorCode.java index 6b7b5a19..9491b8f1 100644 --- a/app/src/main/java/me/tagavari/airmessage/enums/ConnectionErrorCode.java +++ b/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; } \ No newline at end of file diff --git a/app/src/main/java/me/tagavari/airmessage/helper/ErrorDetailsHelper.kt b/app/src/main/java/me/tagavari/airmessage/helper/ErrorDetailsHelper.kt index c2806928..546c8dfd 100644 --- a/app/src/main/java/me/tagavari/airmessage/helper/ErrorDetailsHelper.kt +++ b/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 -> { diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 25da34fe..bb7c1896 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -488,8 +488,7 @@ Votre serveur personnel n\'est pas disponible La limite de l\'appareil connecté a été atteinte Le compte connecté ne peut pas être utilisé - - Le compte connecté n\'est pas inscrit + Les nouveaux enregistrements sont désactivés L\'ordinateur serveur a été échangé Pas de connexion Internet Erreur de connexion diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f17782f4..aa3cca6d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -481,8 +481,7 @@ パーソナルサーバーが接続されていません 接続デバイスの制限に達しました 接続されたアカウントは使用できません - - 接続されたアカウントは登録されていません + 新規登録はできません サーバーコンピュータが交換されました インターネットに接続できません AirMessage からログアウトしますか？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0adffe35..8d2f0d84 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,8 +194,7 @@ Personal server not available Connected device limit reached Connected account can\'t be used - - Connected account isn\'t enrolled + New registrations are unavailable Server computer swapped An unknown error occurred From b0b38cfd26429479d096ef69c37cbe7fdc64f8ec Mon Sep 17 00:00:00 2001 From: Cole Feuer <13751213+tagavari@users.noreply.github.com> Date: Sat, 3 Jul 2021 10:56:34 -0400 Subject: [PATCH 2/3] Update dependencies --- app/build.gradle | 22 +++++++++++----------- build.gradle | 10 ++++------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e54b618..f786948a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -113,22 +113,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" @@ -142,7 +142,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 @@ -157,7 +157,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" @@ -179,14 +179,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" diff --git a/build.gradle b/build.gradle index cbf05a84..c35bab50 100644 --- a/build.gradle +++ b/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() } From eb8a6682e5eb6d589ab41dab39addb61046241d0 Mon Sep 17 00:00:00 2001 From: Cole Feuer <13751213+tagavari@users.noreply.github.com> Date: Sat, 3 Jul 2021 19:29:41 -0400 Subject: [PATCH 3/3] Change version to 3.1.10 (116) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f786948a..eeade6c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,8 +41,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"