Skip to content

Commit

Permalink
πŸš€[Release v2.12.2 20241118] Merge into Main (#273)
Browse files Browse the repository at this point in the history
* πŸš€[Release v2.11.1 071024] Merge into Develop (#245)

* replaced the control in PeerManager.c

Signed-off-by: kcw-grunt <[email protected]>

* reverted BRBitcoinAmount

Signed-off-by: kcw-grunt <[email protected]>

* Cleaning up the files

Signed-off-by: kcw-grunt <[email protected]>

* Removed Pusher remnants

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

* Added Fiat feature, and FCM for push notifications (#247)

* Added fiat feature based on language user chose

* added fcm for push notifications

* Update PushNotificationService.kt

* Added new Icon, removed duplicate fcm library, added in app messaging

* Added new Icon, removed duplicate fcm library, added in app messaging

* Tech debt/add af sdk (#248)

* Recent newline

Signed-off-by: kcw-grunt <[email protected]>

* AF added

Refactored cruft

- AF working

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

* Techdebt/refactor brevents syncmarkers (#254)

* Tech debt/add af sdk (#248)

- AF working
- Changed requiredActivity
- Added analytics error report
- test this.Activity is null or not
- Bugfix - Phrase Reminder crash
- added an exception handler for UserNotAuthenticatedException.
		 - note: this should allow for the system to display the native authorization UI when needed
		 - fixes issue - https://console.firebase.google.com/u/0/project/litewallet-beta/crashlytics/app/android:com.loafwallet/issues/09dac17241309f0e823ef597a9a82cd4
- Added dev note
- remove calls to BREventManager
- removed BREventManager
- renamed error message
- fixed Firebase Analytics event error

Signed-off-by: kcw-grunt <[email protected]>

* version bump

update gitignore

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

* Techdebt/ fixed send issue add syncing measurements (#255)

* removed unused BRSharedPreferences

Signed-off-by: kcw-grunt <[email protected]>

* started commenting out more Timber

Signed-off-by: kcw-grunt <[email protected]>

* Added more shared preferences for syncing

Signed-off-by: kcw-grunt <[email protected]>

* Commented out many verbose Timber logs

Signed-off-by: kcw-grunt <[email protected]>

* WIP

Still trying to figure out the eplased time and last and start timestamps…???
I dunno

Signed-off-by: kcw-grunt <[email protected]>

* Moved sync measurment into the method calls

Signed-off-by: kcw-grunt <[email protected]>

* Debugged the install issue with send

- Moved all the measurements in new methods
- recalculated measure points
- Added analytics
- event did_complete_sync was shown!
- adding a dummy file to make sure file system is set
||||WIP still verifying the JSON is present
- added a blockheight label
-  changed the sleep time (a hack to allow the device time to refresh the view) to 100 ms from 500ms!!
-WIP Why is the bundle not showing on time
Signed-off-by: kcw-grunt <[email protected]>

* replaces afID to first location

Signed-off-by: kcw-grunt <[email protected]>

* Removed redundant sync measurements

Signed-off-by: kcw-grunt <[email protected]>

* code bump

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

* Techdebt/test refactor cruft removal (#250)

* Removed non english seed words

-Refactor tests
- Reset AnalyticsTests

Signed-off-by: kcw-grunt <[email protected]>

* Rename Bitcoinletter to Litecoinletters

-added tests
testLitecoinSymbolConstants
testAppExternalURLConstants
testFirebaseAnalyticsConstants

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>

* fix: [#152] make sure using Fragment, FragmentManager and FragmentTransaction from androidx (#260)

* fix: [#126] the issue came from FragmentBalanceSeedReminder.fetchSeedPhrase, so we just wrap with runCatching for now to avoid crash (#263)

* version bump

Signed-off-by: kcw-grunt <[email protected]>

* Removed donation button

removed xml
removed fragments
removed references of the donation
removed analytical events

Signed-off-by: kcw-grunt <[email protected]>

* fix: prevent activity close

* code bump

Signed-off-by: kcw-grunt <[email protected]>

* enabled for Debug

Signed-off-by: kcw-grunt <[email protected]>

* 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 <[email protected]>

* version bump

Signed-off-by: kcw-grunt <[email protected]>

---------

Signed-off-by: kcw-grunt <[email protected]>
Co-authored-by: Josi Kie <[email protected]>
Co-authored-by: Andhika Yuana <[email protected]>
  • Loading branch information
3 people authored Nov 21, 2024
1 parent ad6ac60 commit dcb363e
Show file tree
Hide file tree
Showing 65 changed files with 653 additions and 9,429 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ app/src/litewalletDebug/google-services.json
/app/release/google-services.json
/app/debug/google-services.json
/.idea/dictionaries/grunt.xml
androidTestResultsUserPreferences.xml
65 changes: 0 additions & 65 deletions .idea/androidTestResultsUserPreferences.xml

This file was deleted.

12 changes: 9 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-parcelize'
apply plugin: 'com.google.gms.google-services'

configurations {
ktlint
Expand Down Expand Up @@ -62,8 +63,8 @@ android {
applicationId = 'com.loafwallet'
minSdkVersion 31
targetSdkVersion 34
versionCode 20241007
versionName "v2.11.1"
versionCode 20241118
versionName "v2.12.2"
multiDexEnabled true
archivesBaseName = "${versionName}(${versionCode})"

Expand Down Expand Up @@ -239,6 +240,10 @@ android {
minifyEnabled = false
debuggable = true
}

firebaseCrashlytics {
nativeSymbolUploadEnabled true
}
}

}
Expand Down Expand Up @@ -313,7 +318,8 @@ dependencies {

// push notifications
implementation 'com.google.firebase:firebase-messaging:23.4.0'
implementation 'com.pusher:push-notifications-android:1.9.0'
implementation("com.google.firebase:firebase-inappmessaging-display")


// Timber
implementation 'com.jakewharton.timber:timber:4.7.1'
Expand Down
4 changes: 0 additions & 4 deletions app/evil.json

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.breadwallet;
package com.litewallet;

import android.util.Log;

import com.breadwallet.tools.util.Bip39Reader;
import com.breadwallet.wallet.BRWalletManager;

import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -18,43 +20,32 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;

public class PaperKeyTests {

private static final String TAG = PaperKeyTests.class.getName();
public static final String PAPER_KEY_JAP = "γ“γ›γγ€€γŽγ˜γ«γ£γ¦γ„γ€€γ‘γ£γ“γ‚“γ€€γ›γ€γžγγ€€γ†γ‚“γ©γ†γ€€γ΅γ“γ†γ€€γ«γ£γ™γ†γ€€γ“γ›γ„γ€€γγ•γΎγ€€γͺγΎγΏγ€€γŸγγ³γ€€γ―γ‹γ„";//japanese
public static final String PAPER_KEY_ENG = "stick sword keen afraid smile sting huge relax nominee arena area gift ";//english
public static final String PAPER_KEY_FRE = "vocation triage capsule marchand onduler tibia illicite entier fureur minorer amateur lubie";//french
public static final String PAPER_KEY_SPA = "zorro turismo mezcla nicho morir chico blanco pájaro alba esencia roer repetir";//spanish
public static final String PAPER_KEY_CHI = "怨 θ΄ͺ 旁 ζ‰Ž 吹 音 决 ε»· 十 助 η•œ ζ€’";//chinese
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;

@RunWith(AndroidJUnit4.class)
@LargeTest

// @Test
// public void testWordsValid() {
//
// List<String> list = getAllWords();
// assertThat(list.size(), is(10240));
//
// assertThat(isValid(PAPER_KEY_JAP, list), is(true));
// assertThat(isValid(PAPER_KEY_ENG, list), is(true));
// assertThat(isValid(PAPER_KEY_FRE, list), is(true));
// assertThat(isValid(PAPER_KEY_SPA, list), is(true));
// assertThat(isValid(PAPER_KEY_CHI, list), is(true));
// }
public class PaperKeyTests {
private static final String TAG = PaperKeyTests.class.getName();
public static final List<String> PAPER_KEY_ENG = Arrays.asList("stick","sword","keen","afraid","smile","sting","huge","relax","nominee","arena","area","gift");

@Test
public void testWordsValid() {
List<String> wordList = getAllWords();
Assert.assertEquals(wordList.size(), 2048);
Assert.assertSame(PAPER_KEY_ENG.containsAll(wordList),true);
}
@Test
public void testPaperKeyValidation() {
List<String> list = getAllWords();
assertThat(list.size(), is(10240));
assertThat(list.size(), is(2048));
}

private List<String> getAllWords() {
List<String> result = new ArrayList<>();
List<String> names = new ArrayList<>();
names.add("en-BIP39Words.txt");
names.add("es-BIP39Words.txt");
names.add("fr-BIP39Words.txt");
names.add("ja-BIP39Words.txt");
names.add("zh-BIP39Words.txt");

for (String fileName : names) {
InputStream in = null;
Expand All @@ -78,7 +69,7 @@ private List<String> getAllWords() {
String cleanWord = Bip39Reader.cleanWord(s);
cleanList.add(cleanWord);
}
assertThat(cleanList.size(), is(10240));
assertThat(cleanList.size(), is(2048));
return cleanList;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package com.litewallet.analytics;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import android.util.Log;
import androidx.test.ext.junit.rules.ActivityScenarioRule;

import com.breadwallet.presenter.activities.intro.IntroActivity;
import com.breadwallet.tools.util.BRConstants;

import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

import java.net.URI;

@RunWith(AndroidJUnit4.class)
public class ConstantsTests {
public static final String TAG = ConstantsTests.class.getName();
@Rule
public ActivityScenarioRule<IntroActivity> mActivityRule = new ActivityScenarioRule<>(IntroActivity.class);
@Before
public void setUp() {
Log.e(TAG, "setUp: ");
}

@After
public void tearDown() {
}
@Test
public void testLitecoinSymbolConstants() {
Assert.assertSame(BRConstants.litecoinLowercase,"Ε‚");
Assert.assertSame(BRConstants.litecoinUppercase,"Ł");
}
@Test
public void testAppExternalURLConstants() {
Assert.assertSame(BRConstants.TWITTER_LINK,"https://twitter.com/Litewallet_App");
Assert.assertSame(BRConstants.INSTAGRAM_LINK,"https://www.instagram.com/litewallet.app");
Assert.assertSame(BRConstants.WEB_LINK,"https://litewallet.io");
Assert.assertSame(BRConstants.TOS_LINK,"https://litewallet.io/privacy");
Assert.assertSame(BRConstants.CUSTOMER_SUPPORT_LINK,"https://support.litewallet.io/hc/en-us/requests/new");
Assert.assertSame(BRConstants.BITREFILL_AFFILIATE_LINK,"https://www.bitrefill.com/");
}
@Test
public void testFirebaseAnalyticsConstants() {
Assert.assertSame(BRConstants._20191105_AL,"app_launched");
Assert.assertSame(BRConstants._20191105_VSC,"visit_send_controller");
Assert.assertSame(BRConstants._20202116_VRC,"visit_receive_controller");
Assert.assertSame(BRConstants._20191105_DSL,"did_send_ltc");
Assert.assertSame(BRConstants._20191105_DTBT,"did_tap_buy_tab");
Assert.assertSame(BRConstants._20200111_RNI,"rate_not_initialized");
Assert.assertSame(BRConstants._20200111_FNI,"feeperkb_not_initialized");
Assert.assertSame(BRConstants._20200111_TNI,"transaction_not_initialized");
Assert.assertSame(BRConstants._20200111_WNI,"wallet_not_initialized");
Assert.assertSame(BRConstants._20200111_PNI,"phrase_not_initialized");
Assert.assertSame(BRConstants._20200111_UTST,"unable_to_sign_transaction");
Assert.assertSame(BRConstants._20200112_ERR,"error");
Assert.assertSame(BRConstants._20200112_DSR,"did_start_resync");
Assert.assertSame(BRConstants._20200125_DSRR,"did_show_review_request");
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._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");
Assert.assertSame(BRConstants._20201121_FRIA,"failed_resolve_IPFS_address");
Assert.assertSame(BRConstants._20200207_DTHB,"did_tap_header_balance");
Assert.assertSame(BRConstants._20210427_HCIEEH,"heartbeat_check_if_event_even_happens");
Assert.assertSame(BRConstants._20220822_UTOU,"user_tapped_on_ud");
Assert.assertSame(BRConstants._20230131_NENR,"no_error_nominal_response");
Assert.assertSame(BRConstants._20230407_DCS,"did_complete_sync");
Assert.assertSame(BRConstants._20240123_RAGI,"registered_android_general_interest");
Assert.assertSame(BRConstants._20231225_UAP,"user_accepted_push");
Assert.assertSame(BRConstants._20240101_US,"user_signup");
Assert.assertSame(BRConstants._20241006_DRR,"did_request_rating");
Assert.assertSame(BRConstants._20241006_UCR,"user_completed_rating");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.breadwallet.database;
package com.litewallet.database;

import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.breadwallet.platform;
package com.litewallet.platform;

import androidx.test.filters.LargeTest;
import androidx.test.rule.ActivityTestRule;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.breadwallet.platform;
package com.litewallet.platform;

import androidx.test.rule.ActivityTestRule;
import androidx.test.ext.junit.runners.AndroidJUnit4;
Expand All @@ -8,11 +8,8 @@
import com.breadwallet.presenter.activities.BreadActivity;
import com.breadwallet.tools.util.BRCompressor;
import com.breadwallet.tools.util.BRConstants;
import com.breadwallet.tools.util.Utils;
import com.jniwrappers.BRKey;
import com.platform.APIClient;

import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.breadwallet.security;
package com.litewallet.security;

import android.security.keystore.UserNotAuthenticatedException;
import androidx.test.rule.ActivityTestRule;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.breadwallet.security;
package com.litewallet.security;

import android.app.Activity;
import android.security.keystore.UserNotAuthenticatedException;
Expand Down
Loading

0 comments on commit dcb363e

Please sign in to comment.