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

🚀[Release v2.12.2 20241118] Merge into Main #273

Merged
merged 18 commits into from
Nov 21, 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
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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wondering, why we use this firebase-inappmessaging?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We want to have Inapp and cloud messaging for both here (Android) and iOS. We haven't implemented it properly and you see some of the remnants of our efforts. Once we retire these major bugs we can start looking at adding FEATURES 😄 @andhikayuana



// 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 {
Copy link
Contributor

@andhikayuana andhikayuana Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is not UI test, we can move it to app/src/test instead of app/src/androidTest and using JUnit with mockk.
probably I will help to setup the testing stuff on the next PR

Copy link
Contributor Author

@kcw-grunt kcw-grunt Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @andhikayuana

Added: #280

cc: @josikie

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