Released version 2.9.3 (90)

app/build.gradle

@@ -13,8 +13,8 @@ apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 88
-def canonicalVersionName = "2.9.2"
+def canonicalVersionCode = 90
+def canonicalVersionName = "2.9.3"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

app/buildGradle/dependencies.gradle

@@ -176,4 +176,7 @@ dependencies {
     implementation "com.squareup.phrase:phrase:$phraseVersion"
 
     implementation 'androidx.compose.foundation:foundation:1.7.6'
+
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.70'
+
 }

app/playMainNet/release/output-metadata.json

@@ -11,9 +11,9 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 88,
-      "versionName": "2.9.2",
-      "outputFile": "Bchat-2.9.2-universal.apk"
+      "versionCode": 90,
+      "versionName": "2.9.3",
+      "outputFile": "Bchat-2.9.3-universal.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -24,9 +24,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 88,
-      "versionName": "2.9.2",
-      "outputFile": "Bchat-2.9.2-x86_64.apk"
+      "versionCode": 90,
+      "versionName": "2.9.3",
+      "outputFile": "Bchat-2.9.3-x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -37,9 +37,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 88,
-      "versionName": "2.9.2",
-      "outputFile": "Bchat-2.9.2-armeabi-v7a.apk"
+      "versionCode": 90,
+      "versionName": "2.9.3",
+      "outputFile": "Bchat-2.9.3-armeabi-v7a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -50,9 +50,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 88,
-      "versionName": "2.9.2",
-      "outputFile": "Bchat-2.9.2-arm64-v8a.apk"
+      "versionCode": 90,
+      "versionName": "2.9.3",
+      "outputFile": "Bchat-2.9.3-arm64-v8a.apk"
     }
   ],
   "elementType": "File",
@@ -61,20 +61,20 @@
       "minApi": 28,
       "maxApi": 30,
       "baselineProfiles": [
-        "baselineProfiles/1/Bchat-2.9.2-universal.dm",
-        "baselineProfiles/1/Bchat-2.9.2-x86_64.dm",
-        "baselineProfiles/1/Bchat-2.9.2-armeabi-v7a.dm",
-        "baselineProfiles/1/Bchat-2.9.2-arm64-v8a.dm"
+        "baselineProfiles/1/Bchat-2.9.3-universal.dm",
+        "baselineProfiles/1/Bchat-2.9.3-x86_64.dm",
+        "baselineProfiles/1/Bchat-2.9.3-armeabi-v7a.dm",
+        "baselineProfiles/1/Bchat-2.9.3-arm64-v8a.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
-        "baselineProfiles/0/Bchat-2.9.2-universal.dm",
-        "baselineProfiles/0/Bchat-2.9.2-x86_64.dm",
-        "baselineProfiles/0/Bchat-2.9.2-armeabi-v7a.dm",
-        "baselineProfiles/0/Bchat-2.9.2-arm64-v8a.dm"
+        "baselineProfiles/0/Bchat-2.9.3-universal.dm",
+        "baselineProfiles/0/Bchat-2.9.3-x86_64.dm",
+        "baselineProfiles/0/Bchat-2.9.3-armeabi-v7a.dm",
+        "baselineProfiles/0/Bchat-2.9.3-arm64-v8a.dm"
       ]
     }
   ],

app/src/main/AndroidManifest.xml

@@ -102,41 +102,6 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar" />
-        <activity
-            android:name="io.beldex.bchat.wallet.TransactionDetails"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="io.beldex.bchat.wallet.info.WalletInfoSeedActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="io.beldex.bchat.wallet.info.WalletInfoActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bchat.DayNight.FlatActionBar" />
-        <activity
-            android:name="io.beldex.bchat.wallet.node.activity.NodeActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="io.beldex.bchat.wallet.settings.WalletSettings"
-            android:exported="false"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name="io.beldex.bchat.wallet.utils.pincodeview.CustomPinActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bchat.DayNight.NoActionBar" />
-        <activity
-            android:name="io.beldex.bchat.wallet.password.CreateWalletPassword"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bchat.DayNight.FlatActionBar" />
-        <activity
-            android:name="io.beldex.bchat.wallet.addressbook.AddressBookActivity"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name="io.beldex.bchat.contacts.BlockedContactActivity"
             android:exported="false"
@@ -167,6 +132,20 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="io.beldex.bchat.home.HomeActivity" />
         </activity>
+        <activity
+            android:name="io.beldex.bchat.conversation.v2.ConversationActivityV2"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Bchat.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            />
+        <activity
+            android:name="io.beldex.bchat.conversation.v2.contact_sharing.ViewAllContactsActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Bchat.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            />
         <activity
             android:name="io.beldex.bchat.onboarding.AboutActivity"
             android:exported="false"
@@ -271,10 +250,6 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Bchat.DayNight.FlatActionBar" /> <!-- Disable all analytics -->
-        <activity
-            android:name="io.beldex.bchat.wallet.startwallet.StartWalletInfo"
-            android:exported="false"
-            android:screenOrientation="portrait" />
 
         <meta-data
             android:name="firebase_analytics_collection_deactivated"
@@ -568,25 +543,13 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar"/>
 
-        <activity
-            android:name="io.beldex.bchat.wallet.jetpackcomposeUI.settings.WalletSettingComposeActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bchat.DayNight.NoActionBar"/>
         <activity
             android:name="io.beldex.bchat.groups.SecretGroupInfoComposeActivity"
             android:exported="true"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Bchat.DayNight.NoActionBar"
             />
-        <activity
-            android:name="io.beldex.bchat.wallet.jetpackcomposeUI.node.NodeComposeActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:exported="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.Bchat.DayNight.NoActionBar"/>
 
         <activity
             android:name="io.beldex.bchat.my_account.ui.MyProfileActivity"
@@ -815,13 +778,6 @@
         <meta-data
             android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
             android:value="598.0dip" />
-
-        <service
-            android:name="io.beldex.bchat.wallet.service.WalletService"
-            android:description="@string/service_description"
-            android:exported="false"
-            android:foregroundServiceType="specialUse"
-            android:label="BChat Wallet Service" />
     </application>
 
 </manifest>

app/src/main/assets/changeLog.json

@@ -575,6 +575,17 @@
           "description":"Minor Bug fixes"
         }
       ]
+    },
+    {
+      "title": "2.9.3",
+      "descriptions": [
+        {
+          "description":"Removed Wallet feature"
+        },
+        {
+          "description":"Minor Bug fixes"
+        }
+      ]
     }
   ]
 }

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

@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.content.res.Configuration;
 
-import io.beldex.bchat.model.NetworkType;
 import io.beldex.bchat.util.LocalHelper;
 import timber.log.Timber;
 
@@ -32,7 +31,7 @@ public void onConfigurationChanged(Configuration configuration) {
         LocalHelper.setPreferredLocale(this);
     }
 
-    static public NetworkType getNetworkType() {
+/*    static public NetworkType getNetworkType() {
         switch (BuildConfig.NETWORK_TYPE) {
             case "mainnet":
                 return NetworkType.NetworkType_Mainnet;
@@ -43,5 +42,5 @@ static public NetworkType getNetworkType() {
             default:
                 throw new IllegalStateException("unknown net flavor " + BuildConfig.FLAVOR);
         }
-    }
+    }*/
 }

app/src/main/java/io/beldex/bchat/wallet/CheckOnline.kt → app/src/main/java/io/beldex/bchat/CheckOnline.kt

@@ -1,4 +1,4 @@
-package io.beldex.bchat.wallet
+package io.beldex.bchat
 
 import android.content.Context
 import android.net.ConnectivityManager

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

@@ -64,7 +64,8 @@
 import com.beldex.libbchat.messaging.messages.control.DataExtractionNotification;
 import com.beldex.libbchat.messaging.sending_receiving.MessageSender;
 import com.beldex.libbchat.utilities.Address;
-import io.beldex.bchat.conversation.v2.ConversationFragmentV2;
+
+import io.beldex.bchat.conversation.v2.ConversationActivityV2;
 import io.beldex.bchat.database.CursorRecyclerViewAdapter;
 import io.beldex.bchat.database.MediaDatabase;
 import io.beldex.bchat.database.loaders.BucketedThreadMediaLoader;
@@ -303,14 +304,12 @@ private void handleMediaMultiSelectClick(@NonNull MediaDatabase.MediaRecord medi
       if (result.getResultCode() == Activity.RESULT_OK) {
         Bundle extras = new Bundle();
         assert result.getData() != null;
-        extras.putParcelable(ConversationFragmentV2.ADDRESS,result.getData().getParcelableExtra(ConversationFragmentV2.ADDRESS));
-        extras.putLong(ConversationFragmentV2.THREAD_ID, result.getData().getLongExtra(ConversationFragmentV2.THREAD_ID,-1));
-        Log.d("MediaOverviewActivity->uri",""+result.getData().getParcelableExtra(ConversationFragmentV2.URI));
-        Log.d("MediaOverviewActivity->type",""+result.getData().getStringExtra(ConversationFragmentV2.TYPE));
-        extras.putParcelable(ConversationFragmentV2.URI,result.getData().getParcelableExtra(ConversationFragmentV2.URI));
+        extras.putParcelable(ConversationActivityV2.ADDRESS,result.getData().getParcelableExtra(ConversationActivityV2.ADDRESS));
+        extras.putLong(ConversationActivityV2.THREAD_ID, result.getData().getLongExtra(ConversationActivityV2.THREAD_ID,-1));
+        extras.putParcelable(ConversationActivityV2.URI,result.getData().getParcelableExtra(ConversationActivityV2.URI));
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_TEXT,result.getData().getCharSequenceExtra(Intent.EXTRA_TEXT));
-        intent.putExtra(ConversationFragmentV2.TYPE,result.getData().getStringExtra(ConversationFragmentV2.TYPE));
+        intent.putExtra(ConversationActivityV2.TYPE,result.getData().getStringExtra(ConversationActivityV2.TYPE));
         intent.putExtras(extras);
         requireActivity().setResult(RESULT_OK,intent);
         requireActivity().finish();

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

@@ -55,6 +55,7 @@
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import io.beldex.bchat.conversation.v2.ConversationActivityV2;
 import io.beldex.bchat.database.loaders.PagingMediaLoader;
 import io.beldex.bchat.database.model.MmsMessageRecord;
 import io.beldex.bchat.mms.Slide;
@@ -70,7 +71,6 @@
 import com.beldex.libbchat.utilities.recipients.RecipientModifiedListener;
 import com.beldex.libsignal.utilities.Log;
 import io.beldex.bchat.components.MediaView;
-import io.beldex.bchat.conversation.v2.ConversationFragmentV2;
 import io.beldex.bchat.database.MediaDatabase.MediaRecord;
 import io.beldex.bchat.mediapreview.MediaPreviewViewModel;
 import io.beldex.bchat.mediapreview.MediaRailAdapter;
@@ -360,14 +360,12 @@ private void showOverview() {
     if (result.getResultCode() == Activity.RESULT_OK) {
       Bundle extras = new Bundle();
       assert result.getData() != null;
-      extras.putParcelable(ConversationFragmentV2.ADDRESS,result.getData().getParcelableExtra(ConversationFragmentV2.ADDRESS));
-      extras.putLong(ConversationFragmentV2.THREAD_ID, result.getData().getLongExtra(ConversationFragmentV2.THREAD_ID,-1));
-      Log.d("MediaPreviewActivity->uri",""+result.getData().getParcelableExtra(ConversationFragmentV2.URI));
-      Log.d("MediaPreviewActivity->type",""+result.getData().getStringExtra(ConversationFragmentV2.TYPE));
-      extras.putParcelable(ConversationFragmentV2.URI,result.getData().getParcelableExtra(ConversationFragmentV2.URI));
+      extras.putParcelable(ConversationActivityV2.ADDRESS,result.getData().getParcelableExtra(ConversationActivityV2.ADDRESS));
+      extras.putLong(ConversationActivityV2.THREAD_ID, result.getData().getLongExtra(ConversationActivityV2.THREAD_ID,-1));
+      extras.putParcelable(ConversationActivityV2.URI,result.getData().getParcelableExtra(ConversationActivityV2.URI));
       Intent intent = new Intent();
       intent.putExtra(Intent.EXTRA_TEXT,result.getData().getCharSequenceExtra(Intent.EXTRA_TEXT));
-      intent.putExtra(ConversationFragmentV2.TYPE,result.getData().getStringExtra(ConversationFragmentV2.TYPE));
+      intent.putExtra(ConversationActivityV2.TYPE,result.getData().getStringExtra(ConversationActivityV2.TYPE));
       intent.putExtras(extras);
       setResult(RESULT_OK,intent);
       finish();

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

@@ -11,18 +11,12 @@
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
-
-import io.beldex.bchat.data.BarcodeData;
 import com.beldex.libsignal.utilities.Log;
-import io.beldex.bchat.data.BarcodeData;
 import io.beldex.bchat.home.HomeActivity;
 import io.beldex.bchat.onboarding.SplashScreenActivity;
 import io.beldex.bchat.service.KeyCachingService;
 import com.beldex.libbchat.utilities.TextSecurePreferences;
 import io.beldex.bchat.webrtc.PowerButtonReceiver;
-
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Locale;
 
 //TODO AC: Rename to ScreenLockActionBarActivity.
@@ -246,8 +240,4 @@ private void removeClearKeyReceiver(Context context) {
       clearKeyReceiver = null;
     }
   }
-
-  public void onUriScanned(BarcodeData barcodeData) {
-
-  }
 }