Skip to content

Commit d69ed2c

Browse files
kcw-gruntvsima
andauthored
🚀[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 <[email protected]> * 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 <[email protected]> * version code bump Co-authored-by: Victor Sima <[email protected]>
1 parent d276ce5 commit d69ed2c

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ android {
6464
applicationId = 'com.loafwallet'
6565
minSdkVersion 27
6666
targetSdkVersion 31
67-
versionCode 673
68-
versionName "v2.6.0"
67+
versionCode 674
68+
versionName "v2.6.1"
6969
multiDexEnabled true
7070
archivesBaseName = "${versionName}(${versionCode})"
7171

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

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public void onCreate() {
4545

4646
boolean enableCrashlytics = true;
4747
if (Utils.isEmulatorOrDebug(this)) {
48-
// BRKeyStore.putFailCount(0, this);
4948
enableCrashlytics = false;
5049
}
5150

app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ class FragmentSend : Fragment() {
437437
comment
438438
)
439439
)
440-
AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
440+
//AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
441441
BRSharedPrefs.incrementSendTransactionCount(context)
442442
}
443443
})

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,12 @@ public static JSONArray backupFetchRates(Activity activity) {
157157
}
158158

159159
public static void updateFeePerKb(Context app) {
160-
String jsonString = createGETRequestURL(app, "https://api.loafwallet.org/fee-per-kb");
161-
if (jsonString == null || jsonString.isEmpty()) {
162-
Timber.i("updateFeePerKb: failed to update fee, response string: %s", jsonString);
163-
return;
164-
}
160+
161+
//Operationally, it makes more sense to review the fees than rely on a server.
162+
// Especially, when the missing server causes a major disconnect
163+
// Using this hard code for a bi-yearly review. This matches the architecture in iOS
164+
// KCW: May 3, 2022
165+
String jsonString = "{'fee_per_kb': 10000, 'fee_per_kb_economy': 2500, 'fee_per_kb_luxury': 66746}";
165166
try {
166167
JSONObject obj = new JSONObject(jsonString);
167168
// TODO: Refactor when mobile-api v0.4.0 is in prod

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,18 @@ public static void removeListener(OnIsoChangedListener listener) {
3838
}
3939

4040
public static String getIso(Context context) {
41+
4142
SharedPreferences settingsToGet = context.getSharedPreferences(BRConstants.PREFS_NAME, 0);
4243
String defIso;
4344
try {
4445
defIso = Currency.getInstance(Locale.getDefault()).getCurrencyCode();
4546
} catch (IllegalArgumentException e) {
4647
Timber.e(e);
47-
defIso = Currency.getInstance(Locale.US).getCurrencyCode();
48+
///This is always going to be a Litewallet problem
49+
// Inspired by: https://stackoverflow.com/questions/26376439/locale-getdefault-returns-unsuported-invalid-locale-for-currency-getinstance
50+
defIso = Currency.getInstance(new Locale("en", "US")).getCurrencyCode();
4851
}
52+
4953
return settingsToGet.getString(BRConstants.CURRENT_CURRENCY, defIso);
5054
}
5155

0 commit comments

Comments
 (0)