From 7b090c04495d2578e6e86020388065d6e75a2b73 Mon Sep 17 00:00:00 2001 From: Artem Bazhanov Date: Thu, 22 Aug 2019 22:35:24 +0300 Subject: [PATCH 1/6] =?UTF-8?q?Fix=20hyphenation=20and=20truncation=20issu?= =?UTF-8?q?es=20on=20=E2=80=98Backup=E2=80=99=20screen,=20update=20Vision?= =?UTF-8?q?=20library=20and=20Gradle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ app/build.gradle | 4 ++-- .../feature/main/dialog/BackupWarningDialog.kt | 2 +- .../res/layout/list_item_write_these_words.xml | 14 ++++++++++---- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90216f2..f9a4e0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### Release 1.0.7 (19082201) + +- Fix hyphenation issue on ‘Backup’ screen +- Prevent long words truncation on ‘Backup’ screen + ### Release 1.0.6 (19070301) - Added biometric authentication (i.e. Fingerprint unlock and alike) diff --git a/app/build.gradle b/app/build.gradle index cd0038e..3eb1a81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions' int MAJOR_VERSION = 1 int MINOR_VERSION = 0 -int MICRO_VERSION = 6 +int MICRO_VERSION = 7 int BUILD_FOR_TODAY = 1 def secretsPropertiesFile = rootProject.file("secrets.properties") @@ -69,7 +69,7 @@ dependencies { api 'com.google.android.material:material:1.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.github.alexjlockwood:kyrie:0.1.3' - implementation 'com.google.firebase:firebase-ml-vision:21.0.0' + implementation 'com.google.firebase:firebase-ml-vision:23.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0' kapt 'com.google.dagger:dagger-compiler:2.22.1' diff --git a/app/src/main/java/com/myetherwallet/mewconnect/feature/main/dialog/BackupWarningDialog.kt b/app/src/main/java/com/myetherwallet/mewconnect/feature/main/dialog/BackupWarningDialog.kt index 432ac63..46812e3 100644 --- a/app/src/main/java/com/myetherwallet/mewconnect/feature/main/dialog/BackupWarningDialog.kt +++ b/app/src/main/java/com/myetherwallet/mewconnect/feature/main/dialog/BackupWarningDialog.kt @@ -39,4 +39,4 @@ class BackupWarningDialog : BaseDialogFragment() { } override fun getFragmentTag() = TAG -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/list_item_write_these_words.xml b/app/src/main/res/layout/list_item_write_these_words.xml index 3d6cd65..e9842c6 100644 --- a/app/src/main/res/layout/list_item_write_these_words.xml +++ b/app/src/main/res/layout/list_item_write_these_words.xml @@ -1,7 +1,8 @@ @@ -17,12 +18,17 @@ - - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index 8711ee6..2d53db3 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df3906a..6af3c7a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 19 12:16:00 MSK 2019 +#Wed Aug 21 14:11:52 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip From 15c0cf1ce5418b690e0470abdae34f709f5cd9d6 Mon Sep 17 00:00:00 2001 From: Artem Bazhanov Date: Tue, 24 Sep 2019 18:07:21 +0300 Subject: [PATCH 2/6] Fix concatination issue --- .../mewconnect/core/utils/crypto/MessageCrypt.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/myetherwallet/mewconnect/core/utils/crypto/MessageCrypt.kt b/app/src/main/java/com/myetherwallet/mewconnect/core/utils/crypto/MessageCrypt.kt index 0c22396..6778197 100644 --- a/app/src/main/java/com/myetherwallet/mewconnect/core/utils/crypto/MessageCrypt.kt +++ b/app/src/main/java/com/myetherwallet/mewconnect/core/utils/crypto/MessageCrypt.kt @@ -24,7 +24,7 @@ import javax.crypto.KeyAgreement * Created by BArtWell on 24.07.2018. */ -private const val KEY_PREFIX_FORMAT = "\u0019Ethereum Signed Message:\n%d" +private const val KEY_PREFIX = "\u0019Ethereum Signed Message:\n" class MessageCrypt(private val privateKey: String) { @@ -34,7 +34,7 @@ class MessageCrypt(private val privateKey: String) { } fun formatKeyWithPrefix(data: ByteArray): ByteArray { - val keyWithPrefix = String.format(KEY_PREFIX_FORMAT, data.size).toByteArray() + val keyWithPrefix = (KEY_PREFIX + data.size).toByteArray() return CryptoUtils.keccak256Bytes(keyWithPrefix + data) } } From 4a7e0aed86ea3e8b45069a162d5054d98b8101ba Mon Sep 17 00:00:00 2001 From: Artem Bazhanov Date: Tue, 24 Sep 2019 18:11:27 +0300 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 4 ++++ app/build.gradle | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a4e0c..0bde541 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### Release 1.0.8 (19092401) + +- Fix connection issue related with Arabic language + ### Release 1.0.7 (19082201) - Fix hyphenation issue on ‘Backup’ screen diff --git a/app/build.gradle b/app/build.gradle index 3eb1a81..3ef0188 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions' int MAJOR_VERSION = 1 int MINOR_VERSION = 0 -int MICRO_VERSION = 7 +int MICRO_VERSION = 8 int BUILD_FOR_TODAY = 1 def secretsPropertiesFile = rootProject.file("secrets.properties") From f6d9ec688fc93b6e55379145fb899e960b854955 Mon Sep 17 00:00:00 2001 From: Artem Bazhanov Date: Tue, 24 Sep 2019 19:37:47 +0300 Subject: [PATCH 4/6] Update changelog --- CHANGELOG.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bde541..c681218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,7 @@ -### Release 1.0.8 (19092401) +### Release 1.0.7 (19092401) -- Fix connection issue related with Arabic language - -### Release 1.0.7 (19082201) - -- Fix hyphenation issue on ‘Backup’ screen -- Prevent long words truncation on ‘Backup’ screen +- Fixed a rare case with truncated words in Backup scenario +- Fixed connection scenario for Arabic languages ### Release 1.0.6 (19070301) From 365b27f4edfdf3cd8062dc7b40c4e31a2f4d40a4 Mon Sep 17 00:00:00 2001 From: Artem Bazhanov Date: Tue, 24 Sep 2019 19:53:58 +0300 Subject: [PATCH 5/6] Fix version --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3ef0188..3eb1a81 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ apply plugin: 'org.jetbrains.kotlin.android.extensions' int MAJOR_VERSION = 1 int MINOR_VERSION = 0 -int MICRO_VERSION = 8 +int MICRO_VERSION = 7 int BUILD_FOR_TODAY = 1 def secretsPropertiesFile = rootProject.file("secrets.properties") From bd772ad663938cd293c6366af591fc889b9fa8d4 Mon Sep 17 00:00:00 2001 From: Mikhail Nikanorov Date: Tue, 24 Sep 2019 11:34:22 -0700 Subject: [PATCH 6/6] Bump gradle version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3e015b..00c8a62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:5.1.1-jdk8 +FROM gradle:5.4.1-jdk8 USER root ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \ ANDROID_HOME="/usr/local/android-sdk" \