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.

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

🛠️ [Techdebt] Refactor code and inline fees #179

Merged
merged 7 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,6 @@ app/src/litewallet/debug/google-services.json
app/src/debug/litewallet/google-services.json
app/src/litewallet/google-services.json
app/src/debug/google-services.json
app/src/litewalletDebug/google-services.json
app/src/litewalletDebug/google-services.json
/app/release/google-services.json
/app/debug/google-services.json
13 changes: 13 additions & 0 deletions .idea/androidTestResultsUserPreferences.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-parcelize'

Expand Down Expand Up @@ -66,8 +65,8 @@ android {
applicationId = 'com.loafwallet'
minSdkVersion 31
targetSdkVersion 33
versionCode 20240326
versionName "v2.9.1"
versionCode 20240421
versionName "v2.10.0"
multiDexEnabled true
archivesBaseName = "${versionName}(${versionCode})"

Expand Down Expand Up @@ -318,7 +317,7 @@ dependencies {

// push notifications
implementation 'com.google.firebase:firebase-messaging:23.4.0'
implementation 'com.pusher:push-notifications-android:1.8.0'
implementation 'com.pusher:push-notifications-android:1.9.0'

// Timber
implementation 'com.jakewharton.timber:timber:4.7.1'
Expand Down Expand Up @@ -375,4 +374,5 @@ tasks.register("ktlintFormat", JavaExec) {
jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
// see https://pinterest.github.io/ktlint/install/cli/#command-line-usage for more information
args "-F", "src/**/*.kt", "**.kts", "!**/build/**"
}
}
apply plugin: 'com.google.gms.google-services'
52 changes: 26 additions & 26 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,132 +98,132 @@
android:name=".presenter.activities.SetPinActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.intro.RecoverActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.WipeActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.ImportActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.ReEnterPinActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.UpdatePinActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.LoginActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SettingsActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.NotificationActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SyncBlockchainActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.DisplayCurrencyActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.AboutActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SecurityCenterActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.ShareDataActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.intro.WriteDownActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.PaperKeyActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.SpendLimitActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.PaperKeyProveActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.InputWordsActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.camera.ScanQRActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.DisabledActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.FingerprintActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.AdvancedActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.NodesActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.camera.CameraActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />
<activity
android:name=".presenter.activities.settings.TestActivity"
android:exported="true"
android:launchMode="singleTask"
android:screenOrientation="portrait"></activity>
android:screenOrientation="portrait" />

<service
android:name=".tools.listeners.SyncReceiver"
Expand Down
31 changes: 6 additions & 25 deletions app/src/main/java/com/breadwallet/BreadApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Point;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.util.Log;
import android.view.Display;
import android.view.WindowManager;

import com.breadwallet.di.component.DaggerAppComponent;
import com.breadwallet.presenter.activities.util.BRActivity;
import com.breadwallet.presenter.entities.PartnerNames;
Expand All @@ -24,17 +22,9 @@
import com.google.android.gms.common.GooglePlayServicesRepairableException;
import com.google.firebase.crashlytics.FirebaseCrashlytics;

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Currency;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -80,12 +70,9 @@ public void onCreate() {
DISPLAY_HEIGHT_PX = size.y;
mFingerprintManager = (FingerprintManager) getSystemService(Context.FINGERPRINT_SERVICE);
}


public static Context getBreadContext() {
return currentActivity == null ? SyncReceiver.app : currentActivity;
}

public static void setBreadContext(Activity app) {
currentActivity = app;
}
Expand All @@ -94,16 +81,13 @@ public static void fireListeners() {
if (listeners == null) return;
for (OnAppBackgrounded lis : listeners) lis.onBackgrounded();
}

public static void addOnBackgroundedListener(OnAppBackgrounded listener) {
if (listeners == null) listeners = new ArrayList<>();
if (!listeners.contains(listener)) listeners.add(listener);
}

public static boolean isAppInBackground(final Context context) {
return context == null || activityCounter.get() <= 0;
}

//call onStop on evert activity so
public static void onStop(final BRActivity app) {
if (isBackgroundChecker != null) isBackgroundChecker.cancel();
Expand All @@ -123,13 +107,11 @@ public void run() {

isBackgroundChecker.schedule(backgroundCheck, 500, 500);
}

@Override
protected void attachBaseContext(Context base) {
LocaleHelper.Companion.init(base);
super.attachBaseContext(LocaleHelper.Companion.getInstance().setLocale(base));
}

public interface OnAppBackgrounded {
void onBackgrounded();
}
Expand All @@ -139,7 +121,8 @@ private void loadAdvertisingAndPush(Context app) {
public void run() {
try {
AdvertisingIdClient.Info adInfo = AdvertisingIdClient.getAdvertisingIdInfo(app);
finished(adInfo);
finishedLoadingPushService(adInfo);

} catch (IllegalStateException e) {
e.printStackTrace();
} catch (GooglePlayServicesRepairableException e) {
Expand All @@ -149,22 +132,21 @@ public void run() {
} catch (GooglePlayServicesNotAvailableException e) {
e.printStackTrace();
}
finished(null);
finishedLoadingPushService(null);
}
});
thr.start();
}

private void finished(final AdvertisingIdClient.Info adInfo) {
private void finishedLoadingPushService(final AdvertisingIdClient.Info adInfo) {
if(adInfo!=null) {

// setup Pusher Interests
String adInfoString = adInfo.getId();
String generalAndroidInterest = "general-android";
String debugGeneralAndroidInterest = "debug-general-android";
String pusherInstanceID = Utils.fetchPartnerKey(this, PartnerNames.PUSHERSTAGING);

// setup Push Notifications
//This worked had to add the iid dep https://github.com/mixpanel/mixpanel-android/issues/744
String pusherInstanceID = Utils.fetchPartnerKey(this, PartnerNames.PUSHERSTAGING);
PushNotifications.start(getApplicationContext(), pusherInstanceID);
PushNotifications.addDeviceInterest(generalAndroidInterest);
PushNotifications.addDeviceInterest(debugGeneralAndroidInterest);
Expand All @@ -177,7 +159,6 @@ private void finished(final AdvertisingIdClient.Info adInfo) {
AnalyticsManager.logCustomEventWithParams(BRConstants._20240123_RAGI, params);
}
}

private static class CrashReportingTree extends Timber.Tree {
private static final String CRASHLYTICS_KEY_PRIORITY = "priority";
private static final String CRASHLYTICS_KEY_TAG = "tag";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,17 +368,17 @@ public void updateUI() {
BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(() -> {
Thread.currentThread().setName(Thread.currentThread().getName() + ":updateUI");
//sleep a little in order to make sure all the commits are finished (like SharePreferences commits)
String iso = BRSharedPrefs.getIso(BreadActivity.this);
String iso = BRSharedPrefs.getIsoSymbol(BreadActivity.this);

//current amount in litoshis
final BigDecimal amount = new BigDecimal(BRSharedPrefs.getCatchedBalance(BreadActivity.this));

//amount in LTC units
BigDecimal btcAmount = BRExchange.getBitcoinForSatoshis(BreadActivity.this, amount);
BigDecimal btcAmount = BRExchange.getLitecoinForLitoshis(BreadActivity.this, amount);
final String formattedBTCAmount = BRCurrency.getFormattedCurrencyString(BreadActivity.this, "LTC", btcAmount);

//amount in currency units
final BigDecimal curAmount = BRExchange.getAmountFromSatoshis(BreadActivity.this, iso, amount);
final BigDecimal curAmount = BRExchange.getAmountFromLitoshis(BreadActivity.this, iso, amount);
final String formattedCurAmount = BRCurrency.getFormattedCurrencyString(BreadActivity.this, iso, curAmount);
runOnUiThread(() -> {
primaryPrice.setText(formattedBTCAmount);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,23 +172,10 @@ public void onCancel() {
}, 500);

setCurrentLtcPrice();

if (BuildConfig.VERSION_NAME == "v2.8.4") {
Snackbar.make(parentLayout,
R.string.release_notes,
Snackbar.LENGTH_INDEFINITE).setAction(R.string.Webview_dismiss, new View.OnClickListener() {
@Override
public void onClick(View view) {

}
})
.setActionTextColor(getResources().getColor(android.R.color.holo_red_light ))
.show();
}
}

private void setCurrentLtcPrice() {
String iso = BRSharedPrefs.getIso(this);
String iso = BRSharedPrefs.getIsoSymbol(this);

String formattedCurrency = null;
CurrencyEntity currency = CurrencyDataSource.getInstance(this).getCurrencyByIso(iso);
Expand Down
Loading