🚀[Release v.2.10.0-20240421] Merge into Develop

.gitignore

@@ -74,7 +74,6 @@ crash.txt
 /projectFilesBackup/
 /publishTODO.txt
 .idea/copyright/
-
 /.idea/markdown-navigator/
 /app/src/main/java/com/breadwallet/presenter/fragments/FragmentBreadSignal.java
 /fastlane/

app/build.gradle

@@ -65,7 +65,7 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 20240421
+        versionCode 20240424
         versionName "v2.10.0"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
@@ -213,13 +213,13 @@ android {
     }
 
     buildTypes {
-//        gitUpdateModules()
-//        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
         release {
             signingConfig signingConfigs.release
-            minifyEnabled = false
+            minifyEnabled = true
             debuggable = false
+            //DEV: Mothballing gitUpdateModules() until time to resolve:
+            //gitUpdateModules()
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
             ndk {
                 minifyEnabled = false

app/src/main/java/com/breadwallet/BreadApp.java

@@ -61,7 +61,14 @@ public void onCreate() {
         FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(enableCrashlytics);
         AnalyticsManager.init(this);
         AnalyticsManager.logCustomEvent(BRConstants._20191105_AL);
-        loadAdvertisingAndPush(this);
+
+        new Thread(() -> {
+            //fetch instance ID
+            String instanceID = Utils.fetchPartnerKey(this,
+                    PartnerNames.PUSHERSTAGING);
+            // setup Push Notifications
+            loadAdvertisingAndPush(instanceID, this);
+        }).start();
 
         WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
         Display display = wm.getDefaultDisplay();
@@ -115,14 +122,13 @@ protected void attachBaseContext(Context base) {
     public interface OnAppBackgrounded {
         void onBackgrounded();
     }
-    private void loadAdvertisingAndPush(Context app) {
-        Thread thr = new Thread(new Runnable() {
+    private void loadAdvertisingAndPush(String instanceID, Context app) {
+        new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
                     AdvertisingIdClient.Info adInfo = AdvertisingIdClient.getAdvertisingIdInfo(app);
-                    finishedLoadingPushService(adInfo);
-
+                    finishedLoadingPushService( instanceID, adInfo);
                 } catch (IllegalStateException e) {
                     e.printStackTrace();
                 } catch (GooglePlayServicesRepairableException e) {
@@ -132,31 +138,27 @@ public void run() {
                 } catch (GooglePlayServicesNotAvailableException e) {
                     e.printStackTrace();
                 }
-                finishedLoadingPushService(null);
+                String emptyID = "";
+                finishedLoadingPushService(emptyID,null);
+                Bundle params = new Bundle();
+                params.putString("pusher_instanceid_not_found",emptyID);
+                AnalyticsManager.logCustomEventWithParams(BRConstants._20200112_ERR, params);
             }
-        });
-        thr.start();
+        }).start();
     }
-    private void finishedLoadingPushService(final AdvertisingIdClient.Info adInfo) {
-        if(adInfo!=null) {
-
+    private void finishedLoadingPushService(final String instanceID, AdvertisingIdClient.Info adInfo) {
+        if(adInfo!=null && instanceID != "") {
             // setup Pusher Interests
             String adInfoString = adInfo.getId();
             String generalAndroidInterest = "general-android";
             String debugGeneralAndroidInterest = "debug-general-android";
 
-            // setup Push Notifications
-            String pusherInstanceID = Utils.fetchPartnerKey(this, PartnerNames.PUSHERSTAGING);
-            PushNotifications.start(getApplicationContext(), pusherInstanceID);
+            PushNotifications.start(getApplicationContext(), instanceID);
             PushNotifications.addDeviceInterest(generalAndroidInterest);
             PushNotifications.addDeviceInterest(debugGeneralAndroidInterest);
 
             //Send params for pusher setup
-            Bundle params = new Bundle();
-            params.putString("general-interest",generalAndroidInterest);
-            params.putString("debug-general-interest",debugGeneralAndroidInterest);
-            params.putString("device-ad-info",adInfoString);
-            AnalyticsManager.logCustomEventWithParams(BRConstants._20240123_RAGI, params);
+            AnalyticsManager.logCustomEvent(BRConstants._20240123_RAGI);
         }
     }
     private static class CrashReportingTree extends Timber.Tree {

app/src/main/java/com/breadwallet/entities/IntroLanguage.kt

@@ -7,4 +7,4 @@ data class IntroLanguage(
     val audio : Int,
     val message: String,
     val lang: Language
-)
+)

app/src/main/java/com/breadwallet/presenter/activities/intro/IntroActivity.java

@@ -89,7 +89,6 @@ public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newStat
 
         });
 
-
         listLangRecyclerView.setLayoutManager(layoutManager);
 
         setListeners();
@@ -206,7 +205,6 @@ public void onClick(View v) {
         });
     }
 
-
     @Override
     protected void onResume() {
         super.onResume();

app/src/main/java/com/breadwallet/presenter/activities/settings/SyncBlockchainActivity.java

@@ -40,7 +40,6 @@ public class SyncBlockchainActivity extends BRActivity {
 
     public static boolean appVisible = false;
     private static TextView syncPreferenceTextView;
-    private ImageButton fingerPrint;
 
     private static SyncBlockchainActivity app;
     public static SyncBlockchainActivity getApp() {
@@ -74,12 +73,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
         syncRadioGroup = (RadioGroup) findViewById(R.id.sync_radio_group);
 
-        ImageButton faq = (ImageButton) findViewById(R.id.faq_button);
         syncPreferenceTextView =  (TextView)  findViewById(R.id.sync_preferences);
         scanButton = (Button) findViewById(R.id.button_scan);
         lowPrivacyButton = (Button) findViewById(R.id.radio_low_privacy);
         semiPrivateButton = (Button) findViewById(R.id.radio_semi_private);
         anonymousButton = (Button) findViewById(R.id.radio_anonymous);
+        closeButton = (ImageButton) findViewById(R.id.close_button);
 
         lowPrivacyButton.setText(getString(R.string.radio_low_privacy));
         semiPrivateButton.setText(getString(R.string.radio_semi_private));
@@ -139,8 +138,6 @@ public void onClick(BRDialogView brDialogView) {
                         }, null, 0);
             }
         });
-
-        closeButton = (ImageButton) findViewById(R.id.close_button);
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/breadwallet/presenter/entities/PaymentItem.java

@@ -0,0 +1,30 @@
+package com.breadwallet.presenter.entities;
+
+public class PaymentItem {
+    public static final String TAG = PaymentItem.class.getName();
+
+    public byte[] serializedTx;
+    public String[] addresses;
+    public long amount;
+    public String cn;
+    public boolean isAmountRequested;
+    public String comment;
+
+    public PaymentItem(String[] addresses, byte[] tx, long theAmount, String theCn, boolean isAmountRequested) {
+        this.isAmountRequested = isAmountRequested;
+        this.serializedTx = tx;
+        this.addresses = addresses;
+        this.amount = theAmount;
+        this.cn = theCn;
+    }
+
+    public PaymentItem(String[] addresses, byte[] tx,long theAmount, String theCn, boolean isAmountRequested, String comment) {
+        this.isAmountRequested = isAmountRequested;
+        this.serializedTx = tx;
+        this.addresses = addresses;
+        this.amount = theAmount;
+        this.cn = theCn;
+        this.comment = comment;
+    }
+
+}

app/src/main/java/com/breadwallet/presenter/fragments/FragmentFingerprint.java

@@ -110,7 +110,6 @@ public void onClick(View view) {
             public void onClick(View view) {
                 if (!BRAnimator.isClickAllowed()) return;
                 closeMe();
-                goToBackup();
             }
         });
 
@@ -137,8 +136,6 @@ public void onGlobalLayout() {
     @Override
     public void onStop() {
         super.onStop();
-//        animateBackgroundDim(true);
-//        animateSignalSlide(true);
         if (!authSucceeded)
             completion.onCancel();
     }
@@ -156,25 +153,6 @@ public void onPause() {
         mFingerprintUiHelper.stopListening();
     }
 
-    /**
-     * Switches to backup (password) screen. This either can happen when fingerprint is not
-     * available or the user chooses to use the password authentication method by pressing the
-     * button. This can also happen when the user had too many fingerprint attempts.
-     */
-    private void goToBackup() {
-        final Context app = getContext();
-        closeMe();
-
-        if (mFingerprintUiHelper != null)
-            mFingerprintUiHelper.stopListening();
-        new Handler().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                AuthManager.getInstance().authPrompt(app, customTitle, customMessage, true, false, completion);
-            }
-        }, ANIMATION_DURATION + 100);
-    }
-
     @Override
     public void onAuthenticated() {
         final Activity app = getActivity();
@@ -194,7 +172,10 @@ public void setCompletion(BRAuthCompletion completion) {
 
     @Override
     public void onError() {
-        goToBackup();
+        String authError = "auth_prompt_failed";
+        Bundle params = new Bundle();
+        params.putString("error_message",authError);
+        AnalyticsManager.logCustomEventWithParams(BRConstants._20200112_ERR, params);
     }
 
     private void animateBackgroundDim(boolean reverse) {

app/src/main/java/com/breadwallet/tools/adapter/CountryLanguageAdapter.kt

@@ -100,4 +100,3 @@ class CountryLanguageAdapter(context: Context,val languages: Array<IntroLanguage
         mediaPlayer?.release()
     }
 }
-

app/src/main/java/com/breadwallet/tools/adapter/TransactionListAdapter.java

@@ -1,7 +1,4 @@
 package com.breadwallet.tools.adapter;
-
-import static java.util.function.Predicate.not;
-
 import android.app.Activity;
 import android.content.Context;
 import android.util.TypedValue;
@@ -50,7 +47,6 @@ public class TransactionListAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     private final int promptResId;
     private List<TxItem> backUpFeed;
     private List<TxItem> itemFeed;
-    //    private Map<String, TxMetaData> mds;
     private final int txType = 0;
     private final int promptType = 1;
     private final int syncingType = 2;

app/src/main/java/com/breadwallet/tools/manager/SyncManager.java

@@ -80,8 +80,6 @@ public synchronized void stopSyncingProgressThread() {
             Timber.e(ex);
         }
     }
-
-
     private class SyncProgressTask extends Thread {
         public double progressStatus = 0;
         private BreadActivity app;

app/src/main/java/com/breadwallet/wallet/BRWalletManager.java

@@ -663,6 +663,7 @@ public void setFeePerKb(long fee) {
     public native String reverseTxHash(String txHash);
 
     public native String txHashToHex(byte[] txHash);
+
     public native long nativeBalance();
 
     public native long defaultFee();

app/src/main/res/layout/activity_sync_blockchain.xml

@@ -115,13 +115,14 @@
         app:layout_constraintRight_toRightOf="parent" />
 
     <ImageButton
-        android:id="@+id/faq_button"
-        android:layout_width="@dimen/faq_dimen"
-        android:layout_height="@dimen/faq_dimen"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="0dp"
-        android:visibility="invisible"
+        android:id="@+id/close_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="16dp"
+        android:backgroundTint="#F6F8FA"
+        android:src="@drawable/ic_close_black_24dp"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/title"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@+id/title" />

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

@@ -173,7 +173,6 @@
     <string name="Import.warning">Importing a wallet does not include transaction history or other details.</string>
     <!-- Wrong password alert message -->
     <string name="Import.wrongPassword">Wrong password, please try again.</string>
-    <!-- Close app button -->
     <!-- Ignore jailbreak warning button -->
     <string name="JailbreakWarnings.ignore">Ignore</string>
     <!-- Jailbreak warning message -->