various tweaks

README.md

@@ -56,6 +56,10 @@ On Debian-based systems:
     sdkmanager "platform-tools" "platforms;android-28"
     gradle build
 
+Make sure you have Gradle 5.4.x or higher, 5.4.1 is known to work:
+
+    ./gradlew wrapper --gradle-version=5.4.1
+
 ## Release Build Process
 
 The first time you create a release build you'll need to create two files. The

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

@@ -160,7 +160,7 @@ class QrReaderActivity : AppCompatActivity() {
             if (err.length > 48) {
                 err = err.substring(0, 22) + "...." + err.substring(err.length - 22, err.length)
             }
-            lblErrorMsg.text = "\"$err\" is not a connection string"
+            lblErrorMsg.text = "\"$err\" is not a valid connection string!"
             return
         }
 
@@ -172,7 +172,7 @@ class QrReaderActivity : AppCompatActivity() {
             if (err.length > 48) {
                 err = err.substring(0, 22) + "...." + err.substring(err.length - 22, err.length)
             }
-            lblErrorMsg.text = "\"$err\" is not a valid address"
+            lblErrorMsg.text = "\"$err\" is not a valid HUSH address!"
             return
         }
 

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

@@ -65,7 +65,7 @@ class ReceiveActivity : AppCompatActivity() {
         }
 
         if (addr.isNullOrBlank())
-            addr = "(no address)"
+            addr = "No address!"
 
         val addrTxt = findViewById<TextView>(R.id.addressTxt)
 
@@ -95,7 +95,7 @@ class ReceiveActivity : AppCompatActivity() {
 
     fun setZAddr() {
         addr = DataModel.mainResponseData?.saplingAddress ?: ""
-        txtRcvAddrTitle.text = "Your Hush sapling address"
+        txtRcvAddrTitle.text = "Your Hush shielded address"
         setAddr()
     }
 

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

@@ -166,7 +166,7 @@ class SendActivity : AppCompatActivity() {
                 val alertDialog = AlertDialog.Builder(this@SendActivity)
                 alertDialog.setTitle("Send from t-addr?")
                 alertDialog.setMessage("${DataModel.mainResponseData?.tokenName} $parsedAmt is more than the balance in " +
-                        "your sapling address. This Tx will have to be sent from a transparent address, and will" +
+                        "your shielded address. This Tx will have to be sent from a transparent address, and will" +
                         " not be private.\n\nAre you absolutely sure?")
                 alertDialog.apply {
                     setPositiveButton("Send Anyway") { dialog, id -> doConfirm() }

app/src/main/res/layout/activity_settings.xml

@@ -55,7 +55,7 @@
                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginEnd="8dp"/>
         <TextView
-                android:text="If checked, the app will only attempt a direct connection to SilentDragon, and not route traffic over the internet via the external helper service. Please see the FAQ for more details"
+                android:text="If checked, the app will only attempt a direct connection to SilentDragon, and not route traffic over the internet via the WormHole service at wormhole.myhush.org . Please see the https://myhush.org/silentdragon for more details"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView4" app:layout_constraintStart_toStartOf="parent"
@@ -79,14 +79,14 @@
                 android:layout_marginStart="16dp" android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/textView10"/>
         <TextView
-                android:text="SilentDragon server version"
+                android:text="SilentDragon version"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView10" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="16dp" android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/lblVersionName" android:textStyle="bold"/>
         <TextView
-                android:text="SilentDragon android version"
+                android:text="SilentDragonAndroid version"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView3" android:layout_marginTop="16dp"
@@ -110,4 +110,4 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 android:layout_marginTop="16dp" app:layout_constraintTop_toBottomOf="@+id/lblServerVersion"/>
     </android.support.constraint.ConstraintLayout>
-</android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -2,7 +2,7 @@
 <resources>
     <color name="colorPrimary">#292B2F</color>
     <color name="colorPrimaryDark">#1D1F21</color>
-    <color name="colorAccent">#4CD0C3</color>
+    <color name="colorAccent">#FF0033</color>
     <color name="windowBackground">#2F3237</color>
     <color name="light_grey">#E3E3E3</color>
 

build.gradle

@@ -25,3 +25,8 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+task lint {
+//	lintClassPath = "foo"
+}
+