🚀[Release v2.12.2 20241118] Merge into Develop (#272)

* 🚀[Release v2.11.1 071024] Merge into Main (#246) * replaced the control in PeerManager.c Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * reverted BRBitcoinAmount Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * Cleaning up the files Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * Removed Pusher remnants Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> --------- Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * version bump Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * Removed donation button removed xml removed fragments removed references of the donation removed analytical events Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * fix: prevent activity close * code bump Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * enabled for Debug Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * fix: [#264] add null checking for BRKeyStore.removeAliasAndFiles (#270) * fix: [#265] add null checking, migrate viewpage… (#271) * fix: [WIP][#265] work in progress add null checking, migrate viewpager to viewpager2 and more * fix: [#265] finalize migration some deprecated class and implement null checking at FragmentTransactionItem * fix: dix dismiss outside FragmentTransactionDetails * code bump Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> * version bump Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> --------- Signed-off-by: kcw-grunt <mrkerrywashington@icloud.com> Co-authored-by: andhikayuana <andhikayuana@gmail.com>
litecoin-foundation · Nov 18, 2024 · fccea25 · fccea25
1 parent bf2155b
commit fccea25
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 562 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -63,8 +63,8 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 31
         targetSdkVersion 34
-        versionCode 20241029
-        versionName "v2.12.0"
+        versionCode 20241118
+        versionName "v2.12.2"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
 
@@ -240,6 +240,10 @@ android {
                 minifyEnabled = false
                 debuggable = true
             }
+
+            firebaseCrashlytics {
+                nativeSymbolUploadEnabled true
+            }
         }
 
     }

diff --git a/app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java b/app/src/androidTest/java/com/litewallet/analytics/ConstantsTests.java
@@ -61,8 +61,6 @@ public void testFirebaseAnalyticsConstants() {
         Assert.assertSame(BRConstants._20201118_DTGS,"did_tap_get_support");
         Assert.assertSame(BRConstants._20200217_DUWP,"did_unlock_with_pin");
         Assert.assertSame(BRConstants._20200217_DUWB,"did_unlock_with_biometrics");
-        Assert.assertSame(BRConstants._20200223_DD,"did_donate");
-        Assert.assertSame(BRConstants._20200225_DCD,"did_cancel_donate");
         Assert.assertSame(BRConstants._20200301_DUDFPK,"did_use_default_fee_per_kb");
         Assert.assertSame(BRConstants._20201121_SIL,"started_IFPS_lookup");
         Assert.assertSame(BRConstants._20201121_DRIA,"did_resolve_IPFS_address");

diff --git a/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java b/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java
diff --git a/app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt b/app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt
@@ -43,7 +43,7 @@ import java.util.regex.Pattern
 
 class FragmentSend : Fragment() {
     private lateinit var signalLayout: LinearLayout; private lateinit var keyboardLayout: LinearLayout
-    private lateinit var scanButton: Button; private lateinit var pasteButton: Button; private lateinit var sendButton: Button; private lateinit var donateButton: Button; private lateinit var isoCurrencySymbolButton: Button
+    private lateinit var scanButton: Button; private lateinit var pasteButton: Button; private lateinit var sendButton: Button; private lateinit var isoCurrencySymbolButton: Button
     private lateinit var commentEdit: EditText; private lateinit var addressEdit: EditText;private lateinit var amountEdit: EditText
     private lateinit var isoCurrencySymbolText: TextView; private lateinit var balanceText: TextView; private lateinit var feeText: TextView; private lateinit var feeDescription: TextView; private lateinit var warningText: TextView
     private var amountLabelOn = true; private var ignoreCleanup = false; private var feeButtonsShown = false
@@ -74,7 +74,6 @@ class FragmentSend : Fragment() {
         pasteButton = rootView.findViewById<View>(R.id.paste_button) as Button
 
         sendButton = rootView.findViewById<View>(R.id.send_button) as Button
-        donateButton = rootView.findViewById<View>(R.id.donate_button) as Button
         commentEdit = rootView.findViewById<View>(R.id.comment_edit) as EditText
         amountEdit = rootView.findViewById<View>(R.id.amount_edit) as EditText
         balanceText = rootView.findViewById<View>(R.id.balance_text) as TextView
@@ -389,14 +388,6 @@ class FragmentSend : Fragment() {
                 }
             },
         )
-        donateButton.setOnClickListener(
-            View.OnClickListener {
-                if (!BRAnimator.isClickAllowed()) {
-                    return@OnClickListener
-                }
-                BRAnimator.showDynamicDonationFragment(requireActivity())
-            },
-        )
         backgroundLayout.setOnClickListener(
             View.OnClickListener {
                 if (!BRAnimator.isClickAllowed()) return@OnClickListener
@@ -615,11 +606,6 @@ class FragmentSend : Fragment() {
             formattedNetworkFee,
             formattedServiceFee,
             formattedTotalFees)
-        //(Network + Service): $0.01 + $1.37 = $1.38
-        donateButton.text = getString(R.string.Donate_title, currencySymbol)
-
-        ///Added another check. User must have sent once already before donating
-        donateButton.isEnabled = currentBalance >= BRConstants.DONATION_AMOUNT * 2 && (TxManager.getInstance().adapter.items.size > 1)
         amountLayout.requestLayout()
     }
 

diff --git a/app/src/main/java/com/breadwallet/tools/animation/BRAnimator.java b/app/src/main/java/com/breadwallet/tools/animation/BRAnimator.java
@@ -32,7 +32,6 @@
 import com.breadwallet.presenter.activities.camera.ScanQRActivity;
 import com.breadwallet.presenter.customviews.BRDialogView;
 import com.breadwallet.presenter.entities.TxItem;
-import com.breadwallet.presenter.fragments.DynamicDonationFragment;
 import com.breadwallet.presenter.fragments.FragmentBalanceSeedReminder;
 import com.breadwallet.presenter.fragments.FragmentBuy;
 import com.breadwallet.presenter.fragments.FragmentGreetings;
@@ -277,14 +276,6 @@ public static void showBuyFragment(FragmentActivity app, String currency, Fragme
                 .commit();
     }
 
-    public static void showDynamicDonationFragment(@NonNull FragmentActivity app) {
-        app.getSupportFragmentManager().beginTransaction()
-                .setCustomAnimations(0, 0, 0, R.animator.plain_300)
-                .add(android.R.id.content, new DynamicDonationFragment(), DynamicDonationFragment.class.getName())
-                .addToBackStack(DynamicDonationFragment.class.getName())
-                .commit();
-    }
-
     public static void showMenuFragment(Activity app) {
         if (app == null) {
             Timber.i("timber: showReceiveFragment: app is null");
@@ -330,7 +321,7 @@ public void run() {
     public static void killAllFragments(FragmentActivity app) {
         //DEV: Needs refactor
         if (app != null && !app.isDestroyed() && !app.getSupportFragmentManager().isStateSaved()) {
-            app.getSupportFragmentManager().popBackStack(null, androidx.fragment.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            app.getSupportFragmentManager().popBackStack();
         }
     }
 

diff --git a/app/src/main/java/com/breadwallet/tools/util/BRConstants.java b/app/src/main/java/com/breadwallet/tools/util/BRConstants.java
@@ -87,12 +87,6 @@ private BRConstants() {
 
     public static final String loopBug = "android-loop-bug";
 
-    /**
-     * Donation
-     */
-    public static final String DONATION_ADDRESS =  "MJ4W7NZya4SzE7R6xpEVdamGCimaQYPiWu";
-    public static final long DONATION_AMOUNT = 1_400_000;
-
     /**
      * App External URLs
      */
@@ -129,8 +123,6 @@ private BRConstants() {
     public static final String _20201118_DTGS = "did_tap_get_support";
     public static final String _20200217_DUWP = "did_unlock_with_pin";
     public static final String _20200217_DUWB = "did_unlock_with_biometrics";
-    public static final String _20200223_DD = "did_donate";
-    public static final String _20200225_DCD = "did_cancel_donate";
     public static final String _20200301_DUDFPK = "did_use_default_fee_per_kb";
     public static final String _20201121_SIL = "started_IFPS_lookup";
     public static final String _20201121_DRIA = "did_resolve_IPFS_address";
@@ -167,8 +159,6 @@ private BRConstants() {
             _20201118_DTGS,
             _20200217_DUWP,
             _20200217_DUWB,
-            _20200223_DD,
-            _20200225_DCD,
             _20200301_DUDFPK,
             _20201121_SIL,
             _20201121_DRIA,