Merge branch 'release/1.0.7'

MyEtherWallet · Sep 24, 2019 · 64c7c66 · 64c7c66
2 parents dc27c4d + bd772ad
commit 64c7c66
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
-### Release 1.0.6 (19071201)
+### Release 1.0.7 (19092401)
+
+- Fixed a rare case with truncated words in Backup scenario
+- Fixed connection scenario for Arabic languages
+
+### Release 1.0.6 (19070301)
 
 - Added biometric authentication (i.e. Fingerprint unlock and alike)
 - Updates to ‘What's new’ screen

diff --git 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" \

diff --git 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/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)
         }
     }

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
@@ -39,4 +39,4 @@ class BackupWarningDialog : BaseDialogFragment() {
     }
 
     override fun getFragmentTag() = TAG
-}
+}
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
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dimen_120dp"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/dimen_32dp"
     android:gravity="center_vertical"
     android:orientation="horizontal">
@@ -17,12 +18,17 @@
 
     <TextView
         android:id="@+id/write_these_word_text"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/dimen_8dp"
+        android:breakStrategy="simple"
+        android:gravity="center_vertical"
+        android:hyphenationFrequency="none"
         android:letterSpacing="0.02"
+        android:maxLines="1"
         android:textColor="@color/text_black"
         android:textSize="@dimen/text_size_fixed_20sp"
+        app:autoSizeTextType="uniform"
         tools:text="technical" />
-
-</LinearLayout>
+</LinearLayout>
diff --git 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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,4 @@ class BackupWarningDialog : BaseDialogFragment() { @@
         }
         override fun getFragmentTag() = TAG
-    }
+    }