Merge pull request #62 from Beldex-Coin/dev

Released version 2.6.1
Beldex-Coin · Nov 18, 2024 · 11f449a · 11f449a
2 parents 948df3f + 79cf47f
commit 11f449a
Show file tree

Hide file tree

Showing 43 changed files with 265 additions and 107 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ dependencies {
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 70
-def canonicalVersionName = "2.6.0"
+def canonicalVersionCode = 71
+def canonicalVersionName = "2.6.1"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

diff --git a/app/buildGradle/dependencies.gradle b/app/buildGradle/dependencies.gradle
@@ -72,7 +72,7 @@ dependencies {
     implementation project(":libsignal")
     implementation project(":libsession")
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxJsonVersion"
-    implementation "com.github.oxen-io.session-android-curve-25519:curve25519-java:$curve25519Version"
+    implementation "com.github.session-foundation.session-android-curve-25519:curve25519-java:$curve25519Version"
     implementation 'com.goterl:lazysodium-android:5.0.2@aar'
     implementation "net.java.dev.jna:jna:5.12.1@aar"
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"

diff --git a/app/playMainNet/release/output-metadata.json b/app/playMainNet/release/output-metadata.json
@@ -11,22 +11,22 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 70,
-      "versionName": "2.6.0",
-      "outputFile": "Bchat-2.6.0-universal.apk"
+      "versionCode": 71,
+      "versionName": "2.6.1",
+      "outputFile": "Bchat-2.6.1-universal.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
-      "versionCode": 70,
-      "versionName": "2.6.0",
-      "outputFile": "Bchat-2.6.0-arm64-v8a.apk"
+      "versionCode": 71,
+      "versionName": "2.6.1",
+      "outputFile": "Bchat-2.6.1-armeabi-v7a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -37,22 +37,22 @@
         }
       ],
       "attributes": [],
-      "versionCode": 70,
-      "versionName": "2.6.0",
-      "outputFile": "Bchat-2.6.0-x86_64.apk"
+      "versionCode": 71,
+      "versionName": "2.6.1",
+      "outputFile": "Bchat-2.6.1-x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 70,
-      "versionName": "2.6.0",
-      "outputFile": "Bchat-2.6.0-armeabi-v7a.apk"
+      "versionCode": 71,
+      "versionName": "2.6.1",
+      "outputFile": "Bchat-2.6.1-arm64-v8a.apk"
     }
   ],
   "elementType": "File"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -580,12 +580,15 @@
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar"/>
         <activity
             android:name="io.beldex.bchat.conversation_v2.NewGroupConversationActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:exported="false"
+            android:windowSoftInputMode="adjustResize"
             android:label="@string/title_activity_create_secret_group_screen"
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar" />
 
         <activity
             android:name="io.beldex.bchat.conversation_v2.NewChatConversationActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:exported="false"
             android:label="@string/new_chat_screen_title"
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar" />

diff --git a/app/src/main/assets/changeLog.json b/app/src/main/assets/changeLog.json
@@ -437,6 +437,14 @@
           "description":"Minor bug fixes"
         }
       ]
+    },
+    {
+      "title": "2.6.1",
+      "descriptions": [
+        {
+          "description":"Minor bug fixes"
+        }
+      ]
     }
   ]
 }
diff --git a/app/src/main/java/io/beldex/bchat/MediaOverviewActivity.java b/app/src/main/java/io/beldex/bchat/MediaOverviewActivity.java
@@ -512,21 +512,25 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
             handleSaveMedia(getListAdapter().getSelectedMedia());
             return true;
           case R.id.delete:
-            handleDeleteMedia(getListAdapter().getSelectedMedia());
-            actionMode.finish();
+            if(actionMode != null) {
+              handleDeleteMedia(getListAdapter().getSelectedMedia());
+              actionMode.finish();
+            }
             return true;
           case R.id.select_all:
 
             //New Line
-            if(selectedStatus) {
+            if(selectedStatus && actionMode != null) {
               selectedStatus = false;
               menuItem.setIcon(R.drawable.ic_select_all);
               getListAdapter().clearSelection();
               actionMode.finish();
             }else {
-              selectedStatus = true;
-              menuItem.setIcon(R.drawable.ic_select_all_new);
-              handleSelectAllMedia();
+              if(actionMode != null) {
+                selectedStatus = true;
+                menuItem.setIcon(R.drawable.ic_select_all_new);
+                handleSelectAllMedia();
+              }
             }
 
             //handleSelectAllMedia();

diff --git a/app/src/main/java/io/beldex/bchat/applock/ChangePasswordActivity.kt b/app/src/main/java/io/beldex/bchat/applock/ChangePasswordActivity.kt
@@ -150,6 +150,7 @@ class ChangePasswordActivity : BaseActionBarActivity() {
             }
         })
     }
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         super.onBackPressed()
     }

diff --git a/app/src/main/java/io/beldex/bchat/contacts/ContactSelectionListLoader.kt b/app/src/main/java/io/beldex/bchat/contacts/ContactSelectionListLoader.kt
@@ -47,7 +47,7 @@ class ContactSelectionListLoader(context: Context, val mode: Int, val filter: St
 
     private fun getContacts(contacts: List<Recipient>): List<ContactSelectionListItem> {
         return getItems(contacts, context.getString(R.string.fragment_contact_selection_contacts_title)) {
-            !it.isGroupRecipient && it.isApproved
+            !it.isGroupRecipient && it.isApproved && !it.isBlocked
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,6 +150,7 @@ class ChangePasswordActivity : BaseActionBarActivity() { @@
                 }
             })
         }
+        @Deprecated("Deprecated in Java")
         override fun onBackPressed() {
             super.onBackPressed()
         }
@@ Expand Down @@