Final API23 (Android 6) Support Release #2699
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| name: Check code format | ||
| on: | ||
| pull_request: | ||
| jobs: | ||
| lint: | ||
| name: Check | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Setup NodeJS | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 16 | ||
| - name: Install dependencies | ||
| run: npm install | ||
| - name: Get changed files | ||
| id: changed-files | ||
| uses: tj-actions/changed-files@v34 | ||
| - name: Check all changed files | ||
| run: | | ||
| for file in ${{ steps.changed-files.outputs.all_changed_files }}; do | ||
| npx ec "$file" | ||
| done | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,3 +110,23 @@ | |
|
|
||
| # These classes are duplicated between android.jar and core-lambda-stubs.jar. | ||
| -dontnote java.lang.invoke.** | ||
|
|
||
| -keepclasseswithmembernames,includedescriptorclasses class * { | ||
| native <methods>; | ||
| } | ||
|
|
||
| #trust wallet | ||
| -keep class wallet.core.jni.** { *; } | ||
| -keep class wallet.core.jni.proto.** { *; } | ||
| -keep class org.web3j.** { *; } | ||
|
|
||
| #entities, jsInterface & listeners | ||
| -keep class com.alphawallet.token.** { *; } | ||
| -keep class com.alphawallet.app.walletconnect.** { *; } | ||
| -keep class com.alphawallet.app.web3.** { *; } | ||
| -keep class com.alphawallet.app.web3j.** { *; } | ||
| -keep class com.alphawallet.app.entity.** { *; } | ||
|
|
||
| -repackageclasses | ||
| #-dontobfuscate | ||
| #-printconfiguration ../full-r8-config.txt | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,27 +8,22 @@ | |
| import com.alphawallet.app.C; | ||
| import com.alphawallet.app.entity.AnalyticsProperties; | ||
| import com.alphawallet.app.entity.ServiceErrorException; | ||
| import com.alphawallet.app.repository.KeyProviderFactory; | ||
| import com.google.firebase.crashlytics.FirebaseCrashlytics; | ||
| import com.mixpanel.android.mpmetrics.MixpanelAPI; | ||
|
|
||
| import org.json.JSONException; | ||
| import org.json.JSONObject; | ||
|
|
||
| public class AnalyticsService<T> implements AnalyticsServiceType<T> { | ||
|
|
||
| private final MixpanelAPI mixpanelAPI; | ||
| //private final FirebaseAnalytics firebaseAnalytics; | ||
|
|
||
| public AnalyticsService(Context context) | ||
| { | ||
| mixpanelAPI = MixpanelAPI.getInstance(context, KeyProviderFactory.get().getAnalyticsKey()); | ||
| //firebaseAnalytics = FirebaseAnalytics.getInstance(context); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -62,7 +57,7 @@ private void trackFirebase(AnalyticsProperties analyticsProperties, String event | |
|
|
||
| props.putString(C.APP_NAME, BuildConfig.APPLICATION_ID); | ||
|
|
||
| //firebaseAnalytics.logEvent(eventName, props); | ||
| } | ||
|
|
||
| private void trackMixpanel(AnalyticsProperties analyticsProperties, String eventName) | ||
|
|
@@ -92,17 +87,17 @@ private void trackMixpanel(AnalyticsProperties analyticsProperties, String event | |
| @Override | ||
| public void identify(String uuid) | ||
| { | ||
| //firebaseAnalytics.setUserId(uuid); | ||
| mixpanelAPI.identify(uuid); | ||
| mixpanelAPI.getPeople().identify(uuid); | ||
| /*FirebaseInstanceId.getInstance().getInstanceId() | ||
| .addOnCompleteListener(task -> { | ||
| if (task.isSuccessful()) | ||
| { | ||
| String token = Objects.requireNonNull(task.getResult()).getToken(); | ||
| mixpanelAPI.getPeople().setPushRegistrationId(token); | ||
| } | ||
| });*/ | ||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| package com.alphawallet.app.util; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.widget.RatingBar; | ||
|
|
@@ -10,10 +12,6 @@ | |
| import com.alphawallet.app.R; | ||
| import com.alphawallet.app.repository.PreferenceRepositoryType; | ||
| import com.google.android.material.dialog.MaterialAlertDialogBuilder; | ||
|
|
||
| public class RateApp { | ||
| // should be shown on 5th run or after the first transaction (afterTransaction == true) | ||
|
|
@@ -38,9 +36,7 @@ static public void showRateTheApp(Activity context, PreferenceRepositoryType pre | |
| preferenceRepository.setRateAppShown(); | ||
| } | ||
| }) | ||
| .setNegativeButton(R.string.rate_no_thanks, (dialogInterface, i) -> preferenceRepository.setRateAppShown()); | ||
|
|
||
| AlertDialog dialog = builder.show(); | ||
| ratingBar.setOnRatingBarChangeListener((rb, rating, fromUser) -> { | ||
|
|
@@ -53,18 +49,12 @@ static public void showRateTheApp(Activity context, PreferenceRepositoryType pre | |
| } | ||
| } | ||
|
|
||
| private static void startRateFlow(Activity activity, PreferenceRepositoryType preferenceRepository) { | ||
| //simply take them to play store for now, until the current situation with play store libraries not being allowed is resolved | ||
| Intent intent = new Intent(Intent.ACTION_VIEW); | ||
| intent.setData(Uri.parse("https://play.google.com/store/apps/details?id=" + activity.getPackageName())); | ||
| intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NO_ANIMATION); | ||
| activity.startActivity(intent); | ||
| // save rate ui shown | ||
| preferenceRepository.setRateAppShown(); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,15 @@ | ||
| package com.alphawallet.app.util; | ||
|
|
||
| import android.app.Activity; | ||
| import android.content.Intent; | ||
| import android.net.Uri; | ||
|
|
||
| import com.alphawallet.app.entity.FragmentMessenger; | ||
|
|
||
| public class UpdateUtils { | ||
| //Pull update check for now | ||
| public static void checkForUpdates(Activity context, FragmentMessenger messenger) { | ||
| /*AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); | ||
|
|
||
| Task<AppUpdateInfo> appUpdateInfoTask = appUpdateManager.getAppUpdateInfo(); | ||
|
|
||
|
|
@@ -22,12 +18,18 @@ public static void checkForUpdates(Activity context, FragmentMessenger messenger | |
| { | ||
| messenger.updateReady(appUpdateInfo.availableVersionCode()); | ||
| } | ||
| });*/ | ||
| } | ||
|
|
||
| public static void pushUpdateDialog(Activity activity) | ||
| { | ||
| Intent intent = new Intent(Intent.ACTION_VIEW); | ||
| intent.setData(Uri.parse("https://play.google.com/store/apps/details?id=" + activity.getPackageName())); | ||
| intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NO_ANIMATION); | ||
|
|
||
| activity.startActivity(intent); | ||
|
|
||
| /*AppUpdateManager appUpdateManager = AppUpdateManagerFactory.create(context); | ||
|
|
||
| Task<AppUpdateInfo> appUpdateInfoTask = appUpdateManager.getAppUpdateInfo(); | ||
|
|
||
|
|
@@ -36,6 +38,6 @@ public static void pushUpdateDialog(Activity context) | |
| { | ||
| appUpdateManager.startUpdateFlow(appUpdateInfo, context, AppUpdateOptions.newBuilder(AppUpdateType.FLEXIBLE).build()); | ||
| } | ||
| });*/ | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,10 +42,12 @@ | |
| */ | ||
| public class TokenScriptCertificateTest extends BaseE2ETest | ||
| { | ||
| private String doorContractAddress; | ||
| private final String contractOwnerPk = "0x69c22d654be7fe75e31fbe26cb56c93ec91144fab67cb71529c8081971635069"; | ||
| private final Web3j web3j; | ||
|
|
||
| private final boolean useMumbai = false; //for local testing | ||
|
|
||
| private static final Map<String, String[]> WALLETS_ON_GANACHE = new HashMap<String, String[]>() | ||
| {{ | ||
| put("24", new String[]{"0x644022aef70ad515ee186345fd74b005d759f41be8157c2835de3597d943146d", "0xE494323823fdF1A1Ab6ca79d2538C7182690D52a"}); | ||
|
|
@@ -81,6 +83,12 @@ public TokenScriptCertificateTest() | |
|
|
||
| //Always use zero nonce for determining the contract address | ||
| doorContractAddress = EthUtils.calculateContractAddress(deployCredentials.getAddress(), 0L); | ||
|
|
||
| if (useMumbai) | ||
| { | ||
| //If using Mumbai for this test: | ||
| doorContractAddress = "0xA0343dfd68FcD7F18153b8AB87936c5A9C1Da20e"; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -100,8 +108,8 @@ public void should_view_signature_details() | |
|
|
||
| assertThat(getWalletAddress(), equalTo(ownerAddress)); | ||
|
|
||
| addNewNetwork("Ganache", GANACHE_URL); | ||
| selectTestNet(useMumbai ? "Mumbai" : "Ganache"); | ||
|
|
||
| //Ensure we're on the wallet page | ||
| switchToWallet(ownerAddress); | ||
|
|
@@ -117,7 +125,7 @@ public void should_view_signature_details() | |
|
|
||
| onView(allOf(withId(R.id.edit_text))).perform(replaceText(doorContractAddress)); | ||
|
|
||
| onView(isRoot()).perform(waitUntil(withId(R.id.select_token), 300)); | ||
|
|
||
| click(withId(R.id.select_token)); | ||
|
|
||
|
|
@@ -142,6 +150,8 @@ public void should_view_signature_details() | |
|
|
||
| shouldSee("Smart Token Labs"); | ||
| shouldSee("ECDSA"); | ||
| shouldSee("Contract Owner"); // Note this may fail once we pull owner() from contract, | ||
| // test will need to be changed to contract owner, | ||
| // which for this test is: 0xA20efc4B9537d27acfD052003e311f762620642D | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ | |
| import static com.alphawallet.app.steps.Steps.selectTestNet; | ||
| import static com.alphawallet.app.steps.Steps.sendBalanceTo; | ||
| import static com.alphawallet.app.steps.Steps.switchToWallet; | ||
| import static com.alphawallet.app.util.EthUtils.GANACHE_URL; | ||
| import static org.hamcrest.CoreMatchers.equalTo; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.junit.Assert.fail; | ||
|
|
@@ -46,7 +47,7 @@ public void should_transfer_from_an_account_to_another() { | |
| importWalletFromSettingsPage(privateKey); | ||
| assertThat(getWalletAddress(), equalTo(existedWalletAddress)); | ||
|
|
||
| addNewNetwork("Ganache", GANACHE_URL); | ||
| selectTestNet("Ganache"); | ||
| sendBalanceTo(newWalletAddress, "0.001"); | ||
| ensureTransactionConfirmed(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,6 @@ | |
| import static androidx.test.espresso.matcher.ViewMatchers.withText; | ||
| import static com.alphawallet.app.assertions.Should.shouldNotSee; | ||
| import static com.alphawallet.app.assertions.Should.shouldSee; | ||
| import static com.alphawallet.app.util.Helper.click; | ||
| import static com.alphawallet.app.util.Helper.waitUntil; | ||
| import static com.alphawallet.app.util.RootUtil.isDeviceRooted; | ||
|
|
@@ -204,16 +203,17 @@ public static void toggleSwitch(int id) { | |
| onView(allOf(withId(R.id.switch_material), isDescendantOfA(withId(id)))).perform(ViewActions.click()); | ||
| } | ||
|
|
||
| public static void addNewNetwork(String name, String url) | ||
| { | ||
| gotoSettingsPage(); | ||
| selectMenu("Select Active Networks"); | ||
| click(withId(R.id.action_add)); | ||
| input(R.id.input_network_name, name); | ||
| input(R.id.input_network_rpc_url, url); | ||
| input(R.id.input_network_chain_id, "2"); | ||
| input(R.id.input_network_symbol, "ETH"); | ||
| input(R.id.input_network_explorer_api, url); | ||
| input(R.id.input_network_block_explorer_url, url); | ||
| onView(withId(R.id.network_input_scroll)).perform(swipeUp()); | ||
| Helper.wait(1); | ||
| click(withId(R.id.checkbox_testnet)); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GradleDependencyby Android Lint 🤖