From d1532cf2c3858852bea66eac68aa3c8f3cf3607b Mon Sep 17 00:00:00 2001
From: fuwa <echowss@gmail.com>
Date: Fri, 13 Jul 2018 23:25:32 +0800
Subject: [PATCH] fix newline in seed import

---
 app/build.gradle                                  | 15 +++++++--------
 .../com/m2049r/xmrwallet/GenerateFragment.java    |  2 ++
 xmrwallet.iml                                     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 73434bb..f06cd4d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 25
     buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId "com.m2049r.xmrwallet"
+        applicationId 'org.wownero.wownerojo'
         minSdkVersion 21
         targetSdkVersion 25
         versionCode 100
@@ -17,7 +17,6 @@ android {
             }
         }
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -32,7 +31,6 @@ android {
             path "CMakeLists.txt"
         }
     }
-
     splits {
         abi {
             enable true
@@ -41,10 +39,8 @@ android {
             universalApk true
         }
     }
-
     // Map for the version code that gives each ABI a value.
     def abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2, 'x86': 3, 'x86_64': 4]
-
     // APKs for the same app that all have the same version information.
     android.applicationVariants.all { variant ->
         // Assigns a different version code for each output APK.
@@ -58,6 +54,12 @@ android {
                 outputFileName = "$rootProject.ext.apkName-" + v + "_" + abiName + ".apk"
         }
     }
+    productFlavors {
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -67,12 +69,9 @@ dependencies {
     implementation 'com.android.support:recyclerview-v7:25.4.0'
     implementation 'com.android.support:cardview-v7:25.4.0'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
-
     implementation "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
     implementation "com.jakewharton.timber:timber:$rootProject.ext.timberVersion"
-
     implementation 'com.nulab-inc:zxcvbn:1.2.3'
-
     testImplementation "junit:junit:$rootProject.ext.junitVersion"
     testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
     testImplementation "com.squareup.okhttp3:mockwebserver:$rootProject.ext.okHttpVersion"
diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
index 82bc40a..eea3c99 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
@@ -38,6 +38,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.text.TextUtils;
 
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
@@ -472,6 +473,7 @@ public class GenerateFragment extends Fragment {
         } else if (type.equals(TYPE_SEED)) {
             if (!checkMnemonic()) return;
             String seed = etWalletMnemonic.getEditText().getText().toString();
+            seed = TextUtils.join(" ", seed.split("\\s"));
             bGenerate.setEnabled(false);
             if (fingerprintAuthAllowed) {
                 KeyStoreHelper.saveWalletUserPass(getActivity(), name, password);
diff --git a/xmrwallet.iml b/xmrwallet.iml
index bb050e8..c1ae83e 100644
--- a/xmrwallet.iml
+++ b/xmrwallet.iml
@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />