Skip to content

Hotfix 3.21.1 #2

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

Open
syslink wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Hotfix 3.21.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6446a55
Update Binance transaction API endpoints
JamesSmartCell Dec 2, 2020
cc985b3
Add full migration path in case of user testing old versions, or vers…
JamesSmartCell Dec 2, 2020
b2829a2
Merge branch 'fix-database-upgrade-path' into hotfix-3.21.1
JamesSmartCell Dec 2, 2020
5735b9f
bump gradle
JamesSmartCell Dec 2, 2020
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
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ android {
}
}
defaultConfig {
versionCode 133
versionName "3.20.5"
versionCode 136
versionName "3.21.2"

applicationId "io.stormbird.wallet"
minSdkVersion 23
Expand Down Expand Up @@ -107,7 +107,7 @@ android {
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
dependencies {
implementation 'com.google.firebase:firebase-analytics:17.6.0'
implementation 'com.google.firebase:firebase-analytics:18.0.0'
implementation 'com.mixpanel.android:mixpanel-android:5.8.4'
}
}
Expand Down Expand Up @@ -149,7 +149,7 @@ dependencies {
implementation 'com.google.zxing:core:3.3.2'

// Sugar
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.github.apl-devs:appintro:v4.2.2'
implementation 'com.romandanylyk:pageindicatorview:1.0.0'

Expand Down Expand Up @@ -193,7 +193,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})

implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
implementation 'com.google.firebase:firebase-crashlytics:17.3.0'

implementation "com.trustwallet:wallet-core:0.12.31"

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
ARTIS_TAU1_RPC_URL,
"https://explorer.tau1.artis.network/"),
new NetworkInfo(C.BINANCE_TEST_NETWORK, C.BINANCE_SYMBOL, BINANCE_TEST_RPC_URL,
"https://explorer.binance.org/smart-testnet/tx/", BINANCE_TEST_ID, false,
"https://testnet.bscscan.com/tx/", BINANCE_TEST_ID, false,
BINANCE_TEST_FALLBACK_RPC_URL,
"https://explorer.binance.org/smart-testnet/"),
"https://api-testnet.bscscan.com/"),
new NetworkInfo(C.BINANCE_MAIN_NETWORK, C.BINANCE_SYMBOL, BINANCE_MAIN_RPC_URL,
"https://explorer.binance.org/smart/tx/", BINANCE_MAIN_ID, false,
"https://bscscan.com/tx/", BINANCE_MAIN_ID, false,
BINANCE_MAIN_FALLBACK_RPC_URL,
"https://explorer.binance.org/smart"),
"https://api.bscscan.com/"),
};

final PreferenceRepositoryType preferences;
Expand Down
45 changes: 43 additions & 2 deletions app/src/main/java/com/alphawallet/app/service/AWRealmMigration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,49 @@ public void migrate(DynamicRealm realm, long oldVersion, long newVersion)
if (oldVersion == 7)
{
RealmObjectSchema realmData = schema.get("RealmAuxData");
if (!realmData.hasField("tokenAddress")) realmData.addField("tokenAddress", String.class);
if (!realmData.hasField("resultReceivedTime")) realmData.addField("resultReceivedTime", long.class);
if (realmData == null)
{
schema.create("RealmAuxData")
.addField("instanceKey", String.class, FieldAttribute.PRIMARY_KEY)
.addField("chainId", int.class)
.addField("tokenAddress", String.class)
.addField("tokenId", String.class)
.addField("functionId", String.class)
.addField("result", String.class)
.addField("resultTime", long.class)
.addField("resultReceivedTime", long.class);
}
else
{
if (!realmData.hasField("tokenAddress"))
realmData.addField("tokenAddress", String.class);
if (!realmData.hasField("resultReceivedTime"))
realmData.addField("resultReceivedTime", long.class);
}

realmData = schema.get("RealmKeyType");
if (realmData == null)
{
schema.create("RealmKeyType")
.addField("address", String.class, FieldAttribute.PRIMARY_KEY)
.addField("type", byte.class)
.addField("authLevel", String.class)
.addField("lastBackup", long.class)
.addField("dateAdded", long.class)
.addField("modulus", String.class);
}

realmData = schema.get("RealmWalletData");
if (realmData == null)
{
schema.create("RealmWalletData")
.addField("address", String.class, FieldAttribute.PRIMARY_KEY)
.addField("ENSName", String.class)
.addField("balance", String.class)
.addField("name", String.class)
.addField("lastWarning", long.class);
}

oldVersion += 2;
}
else if (oldVersion == 8)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
// don't do that. add that dependency to app/build.gradle
classpath 'com.google.gms:google-services:4.3.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
}
}

Expand Down