Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚀[Release] v2.6.1 #20

Merged
merged 7 commits into from
May 25, 2022
Merged

🚀[Release] v2.6.1 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
908a196
Added український language
kcw-grunt Apr 12, 2022
e954ed1
Merge pull request #10 from litecoin-foundation/feature/add-ukrainian…
kcw-grunt Apr 18, 2022
1657b3f
🥳[Feature] Unstoppable ext update (#11)
kcw-grunt Apr 18, 2022
8fb1939
This potentially silences the BRSharedPrefs lookup error (#15)
kcw-grunt May 2, 2022
432babb
💣🐞[Hotbug fix] sharedprefs fb fix (#19)
kcw-grunt May 4, 2022
fae9ab4
version code bump
kcw-grunt May 4, 2022
4678c3e
Merge branch 'main' into release/v2.6.1
kcw-grunt May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})"

Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/breadwallet/BreadApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public void onCreate() {

boolean enableCrashlytics = true;
if (Utils.isEmulatorOrDebug(this)) {
// BRKeyStore.putFailCount(0, this);
enableCrashlytics = false;
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/breadwallet/presenter/fragments/FragmentSend.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ class FragmentSend : Fragment() {
comment
)
)
AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
//AnalyticsManager.logCustomEvent(BRConstants._20191105_DSL)
BRSharedPrefs.incrementSendTransactionCount(context)
}
})
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/breadwallet/tools/manager/BRApiManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/breadwallet/tools/manager/BRSharedPrefs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down