Released version 3.0.0 (103)

app/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'witness'
 apply plugin: 'com.google.devtools.ksp'
 apply plugin: 'kotlin-parcelize'
@@ -13,15 +13,17 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 99
-def canonicalVersionName = "2.9.8"
+def canonicalVersionCode = 103
+def canonicalVersionName = "3.0.0"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
                   'arm64-v8a'   : 2,
                   'x86_64'      : 4,
                   'universal'   : 5]
 
+def splitApksEnabled = project.properties["splitApks"] == "true"
+
 android {
     useLibrary 'org.apache.http.legacy'
 
@@ -49,13 +51,19 @@ android {
 
     splits {
         abi {
-            enable true
+            enable splitApksEnabled
             reset()
             include 'armeabi-v7a', 'arm64-v8a', 'x86_64'
             universalApk true
         }
     }
 
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
     defaultConfig {
         versionCode canonicalVersionCode
         versionName canonicalVersionName
@@ -90,6 +98,9 @@ android {
                 cppFlags '-std=c++17'
             }
         }
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+        }
         applicationId 'io.beldex.bchat'
     }
 

app/buildGradle/dependencies.gradle

@@ -16,8 +16,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
     implementation "androidx.paging:paging-runtime-ktx:$pagingVersion"
-    implementation 'androidx.activity:activity-ktx:1.13.0'
-    implementation 'androidx.activity:activity-compose:1.13.0'
+    implementation 'androidx.activity:activity-ktx:1.10.1'
+    implementation 'androidx.activity:activity-compose:1.10.1'
     implementation 'androidx.fragment:fragment-ktx:1.9.0'
     implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.work:work-runtime-ktx:2.11.2"
@@ -40,7 +40,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     ksp "com.github.bumptech.glide:ksp:$glideVersion"
     implementation 'com.makeramen:roundedimageview:2.1.0'
-    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.vanniktech:android-image-cropper:4.5.0'
     implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
     ksp("com.google.dagger:hilt-compiler:$daggerHiltVersion")

app/playMainNet/release/output-metadata.json

@@ -8,51 +8,12 @@
   "variantName": "playMainNetRelease",
   "elements": [
     {
-      "type": "UNIVERSAL",
+      "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 99,
-      "versionName": "2.9.8",
-      "outputFile": "Bchat-2.9.8-universal.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "armeabi-v7a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 99,
-      "versionName": "2.9.8",
-      "outputFile": "Bchat-2.9.8-armeabi-v7a.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "x86_64"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 99,
-      "versionName": "2.9.8",
-      "outputFile": "Bchat-2.9.8-x86_64.apk"
-    },
-    {
-      "type": "ONE_OF_MANY",
-      "filters": [
-        {
-          "filterType": "ABI",
-          "value": "arm64-v8a"
-        }
-      ],
-      "attributes": [],
-      "versionCode": 99,
-      "versionName": "2.9.8",
-      "outputFile": "Bchat-2.9.8-arm64-v8a.apk"
+      "versionCode": 103,
+      "versionName": "3.0.0",
+      "outputFile": "Bchat-3.0.0-universal.apk"
     }
   ],
   "elementType": "File",
@@ -61,20 +22,14 @@
       "minApi": 28,
       "maxApi": 30,
       "baselineProfiles": [
-        "baselineProfiles/1/Bchat-2.9.8-universal.dm",
-        "baselineProfiles/1/Bchat-2.9.8-armeabi-v7a.dm",
-        "baselineProfiles/1/Bchat-2.9.8-x86_64.dm",
-        "baselineProfiles/1/Bchat-2.9.8-arm64-v8a.dm"
+        "baselineProfiles/1/Bchat-3.0.0-universal.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
-        "baselineProfiles/0/Bchat-2.9.8-universal.dm",
-        "baselineProfiles/0/Bchat-2.9.8-armeabi-v7a.dm",
-        "baselineProfiles/0/Bchat-2.9.8-x86_64.dm",
-        "baselineProfiles/0/Bchat-2.9.8-arm64-v8a.dm"
+        "baselineProfiles/0/Bchat-3.0.0-universal.dm"
       ]
     }
   ],

app/src/main/assets/changeLog.json

@@ -647,6 +647,17 @@
           "description":"Minor bug fixes"
         }
       ]
+    },
+    {
+      "title": "3.0.0",
+      "descriptions": [
+        {
+          "description":"Introducing Multi language support in BChat"
+        },
+        {
+          "description":"Minor bug fixes"
+        }
+      ]
     }
   ]
 }

app/src/main/java/io/beldex/bchat/ApplicationContext.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import android.app.KeyguardManager
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.AsyncTask
 import android.os.Handler
 import android.os.HandlerThread
@@ -26,6 +27,7 @@ import com.beldex.libbchat.utilities.ProfilePictureUtilities.upload
 import com.beldex.libbchat.utilities.SSKEnvironment.Companion.configure
 import com.beldex.libbchat.utilities.TextSecurePreferences
 import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.clearAll
+import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getAppSelectedLanguage
 import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getLanguage
 import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getLastProfilePictureUpload
 import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getLocalNumber
@@ -39,6 +41,7 @@ import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.setRefreshD
 import com.beldex.libbchat.utilities.Util.runOnMain
 import com.beldex.libbchat.utilities.dynamiclanguage.DynamicLanguageContextWrapper
 import com.beldex.libbchat.utilities.dynamiclanguage.LocaleParser.Companion.configure
+import com.beldex.libbchat.utilities.dynamiclanguage.LocaleParser.Companion.findBestMatchingLocaleForLanguage
 import com.beldex.libsignal.utilities.HTTP.isConnectedToNetwork
 import com.beldex.libsignal.utilities.JsonUtil
 import com.beldex.libsignal.utilities.Log
@@ -81,6 +84,7 @@ import io.beldex.bchat.service.KeyCachingService
 import io.beldex.bchat.sskenvironment.ProfileManager
 import io.beldex.bchat.sskenvironment.ReadReceiptManager
 import io.beldex.bchat.sskenvironment.TypingStatusRepository
+import io.beldex.bchat.util.AppLanguageEvent
 import io.beldex.bchat.util.Broadcaster
 import io.beldex.bchat.util.FirebaseRemoteConfigUtil
 import io.beldex.bchat.util.UiModeUtilities.setupUiModeToUserSelected
@@ -356,17 +360,26 @@ class ApplicationContext:  Application(), DefaultLifecycleObserver {
         }
     }
 
-    override fun attachBaseContext(base : Context?) {
+    override fun attachBaseContext(base: Context?) {
         initializeLocaleParser()
         super.attachBaseContext(
             DynamicLanguageContextWrapper.updateContext(
-                base, getLanguage(
+                base, getAppSelectedLanguage(
                     base!!
                 )
             )
         )
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        val appSettingLanguage = findBestMatchingLocaleForLanguage(getLanguage(this))
+        TextSecurePreferences.setDeviceLanguage(this, appSettingLanguage?.language)
+        appSettingLanguage?.let { it ->
+            AppLanguageEvent.update(it.language)
+        }
+    }
+
 
     private class ProviderInitializationException() : RuntimeException()
 

app/src/main/java/io/beldex/bchat/BaseActionBarActivity.java

@@ -58,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
   @Override
   protected void onResume() {
     super.onResume();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
+    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getAppSelectedLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
@@ -78,7 +78,7 @@ protected final boolean handleNavigateUp() {
 
   @Override
   protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
+    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getAppSelectedLanguage(newBase)));
   }
 
 

app/src/main/java/io/beldex/bchat/BaseActivity.java

@@ -15,7 +15,7 @@ public abstract class BaseActivity extends FragmentActivity {
   @Override
   protected void onResume() {
     super.onResume();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
+    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getAppSelectedLanguage(this));
     String name = getResources().getString(R.string.app_name);
     Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher_foreground);
     int color = getResources().getColor(R.color.app_icon_background);
@@ -24,6 +24,6 @@ protected void onResume() {
 
   @Override
   protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
+    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getAppSelectedLanguage(newBase)));
   }
 }

app/src/main/java/io/beldex/bchat/BaseAppCompatActivity.kt

@@ -0,0 +1,27 @@
+package io.beldex.bchat
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getAppSelectedLanguage
+import com.beldex.libbchat.utilities.dynamiclanguage.DynamicLanguageActivityHelper
+import com.beldex.libbchat.utilities.dynamiclanguage.DynamicLanguageContextWrapper
+
+
+open class BaseAppCompatActivity : AppCompatActivity() {
+    protected override fun onResume() {
+        super.onResume()
+        DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(
+            this,
+            getAppSelectedLanguage(this)
+        )
+    }
+
+    protected override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(
+            DynamicLanguageContextWrapper.updateContext(
+                newBase,
+                getAppSelectedLanguage(newBase)
+            )
+        )
+    }
+}

app/src/main/java/io/beldex/bchat/BaseComponentActivity.kt

@@ -0,0 +1,26 @@
+package io.beldex.bchat
+
+import android.content.Context
+import androidx.activity.ComponentActivity
+import com.beldex.libbchat.utilities.TextSecurePreferences.Companion.getAppSelectedLanguage
+import com.beldex.libbchat.utilities.dynamiclanguage.DynamicLanguageActivityHelper
+import com.beldex.libbchat.utilities.dynamiclanguage.DynamicLanguageContextWrapper
+
+open class BaseComponentActivity : ComponentActivity() {
+    protected override fun onResume() {
+        super.onResume()
+        DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(
+            this,
+            getAppSelectedLanguage(this)
+        )
+    }
+
+    protected override fun attachBaseContext(newBase: Context) {
+        super.attachBaseContext(
+            DynamicLanguageContextWrapper.updateContext(
+                newBase,
+                getAppSelectedLanguage(newBase)
+            )
+        )
+    }
+}

app/src/main/java/io/beldex/bchat/MediaGalleryAdapter.java

@@ -103,7 +103,7 @@ public ItemViewHolder onCreateItemViewHolder(ViewGroup parent, int itemType) {
 
   @Override
   public void onBindHeaderViewHolder(StickyHeaderGridAdapter.HeaderViewHolder viewHolder, int section) {
-    ((HeaderHolder)viewHolder).textView.setText(media.getName(section, locale));
+    ((HeaderHolder)viewHolder).textView.setText(media.getName(section, context));
   }
 
   @Override