🚀[Release] v2.6.1 (#20)

* Added український language - add uk xml file - removed the nl, sv, da files - Escaped apostrphes in UK strings file - Updated language choices * 🥳[Feature] Unstoppable ext update (#11) * WIP: DNC Dropped in the UD code prior to testing * Added study link * Fix unstoppable domains dependency * Updated the UD ext text WIP::::Need to refactor once UK and deletion on SV, NL, DA * added UK lang Co-authored-by: Victor Sima <vic.sima@gmail.com> * This potentially silences the BRSharedPrefs lookup error (#15) -Litewallet uses the users locale and their currency but the currency may not match. So there is a soft fail. At worst case it should simply default to USD….this is the update for that. Firebase: https://console.firebase.google.com/u/0/project/litewallet-beta/crashlytics/app/android:com.loafwallet/issues/c9ce04d68423ae25f0ee05f2d2e203fa?time=last-seven-days&sessionEventKey=626FCF7303B900017224281106C0856A_1671561729542858575 * 💣🐞[Hotbug fix] sharedprefs fb fix (#19) * Added notes * Bugfix - add missing pendingIntent flag for android 13 * Use firebase bom * subproject commit * version bump * Disabled FB send, Added Get Tasks * Patch to hard code fees - Static fees - Removed the dep - Turn crashlytics back on/off/on Co-authored-by: Victor Sima <vic.sima@gmail.com> * version code bump Co-authored-by: Victor Sima <vic.sima@gmail.com>
litecoin-foundation · May 25, 2022 · d69ed2c · d69ed2c
1 parent d276ce5
commit d69ed2c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -64,8 +64,8 @@ android {
         applicationId = 'com.loafwallet'
         minSdkVersion 27
         targetSdkVersion 31
-        versionCode 673
-        versionName "v2.6.0"
+        versionCode 674
+        versionName "v2.6.1"
         multiDexEnabled true
         archivesBaseName = "${versionName}(${versionCode})"
 

diff --git a/app/src/main/java/com/breadwallet/BreadApp.java b/app/src/main/java/com/breadwallet/BreadApp.java
@@ -45,7 +45,6 @@ public void onCreate() {
 
         boolean enableCrashlytics = true;
         if (Utils.isEmulatorOrDebug(this)) {
-//            BRKeyStore.putFailCount(0, this);
             enableCrashlytics = false;
         }
 

diff --git a/app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt b/app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt
@@ -437,7 +437,7 @@ class FragmentSend : Fragment() {
                         comment
                     )
                 )
-                AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
+                //AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
                 BRSharedPrefs.incrementSendTransactionCount(context)
             }
         })

diff --git a/app/src/main/java/com/breadwallet/tools/manager/BRApiManager.java b/app/src/main/java/com/breadwallet/tools/manager/BRApiManager.java
@@ -157,11 +157,12 @@ public static JSONArray backupFetchRates(Activity activity) {
     }
 
     public static void updateFeePerKb(Context app) {
-        String jsonString = createGETRequestURL(app, "https://api.loafwallet.org/fee-per-kb");
-        if (jsonString == null || jsonString.isEmpty()) {
-            Timber.i("updateFeePerKb: failed to update fee, response string: %s", jsonString);
-            return;
-        }
+
+        //Operationally, it makes more sense to review the fees than rely on a server.
+        // Especially, when the missing server causes a major disconnect
+        // Using this hard code for a bi-yearly review. This matches the architecture in iOS
+        // KCW: May 3, 2022
+        String jsonString = "{'fee_per_kb': 10000, 'fee_per_kb_economy': 2500, 'fee_per_kb_luxury': 66746}";
         try {
             JSONObject obj = new JSONObject(jsonString);
             // TODO: Refactor when mobile-api v0.4.0 is in prod

diff --git a/app/src/main/java/com/breadwallet/tools/manager/BRSharedPrefs.java b/app/src/main/java/com/breadwallet/tools/manager/BRSharedPrefs.java
@@ -38,14 +38,18 @@ public static void removeListener(OnIsoChangedListener listener) {
     }
 
     public static String getIso(Context context) {
+
         SharedPreferences settingsToGet = context.getSharedPreferences(BRConstants.PREFS_NAME, 0);
         String defIso;
         try {
             defIso = Currency.getInstance(Locale.getDefault()).getCurrencyCode();
         } catch (IllegalArgumentException e) {
             Timber.e(e);
-            defIso = Currency.getInstance(Locale.US).getCurrencyCode();
+            ///This is always going to be a Litewallet problem
+            // Inspired by: https://stackoverflow.com/questions/26376439/locale-getdefault-returns-unsuported-invalid-locale-for-currency-getinstance
+            defIso = Currency.getInstance(new Locale("en", "US")).getCurrencyCode();
         }
+
         return settingsToGet.getString(BRConstants.CURRENT_CURRENCY, defIso);
     }