Merge pull request #1 from MyHush/master

merge upstream

app/build.gradle

@@ -17,12 +17,12 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
-        versionName "0.4.0"
+        versionName "0.5.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
-    /*signingConfigs {
+    signingConfigs {
         release {
             storeFile file(secretProperties["store_file_location"])
             keyAlias secretProperties["key_alias"]
@@ -37,7 +37,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-    } */
+    }
 }
 
 dependencies {

app/src/main/java/org/myhush/silentdragon/DataModel.kt

@@ -206,8 +206,7 @@ object DataModel {
             Regex("^ztestsapling[a-z0-9]{76}", RegexOption.IGNORE_CASE).matches(a) ||
                     Regex("^tm[a-z0-9]{33}$", RegexOption.IGNORE_CASE).matches(a)
         } else {
-            Regex("^z[a-z0-9]{77}$", RegexOption.IGNORE_CASE).matches(a) ||
-                    Regex("^t[a-z0-9]{34}$", RegexOption.IGNORE_CASE).matches(a)
+            Regex("^zs1[a-z0-9]{75}$", RegexOption.IGNORE_CASE).matches(a) || Regex("^R[a-z0-9]{33}$", RegexOption.IGNORE_CASE).matches(a)
         }
     }
 
@@ -380,4 +379,4 @@ object DataModel {
     }
 
     private const val TAG = "DataModel"
-}
+}