Merge tag '1.0-rc1' into develop

1.0-rc1

app/build.gradle

@@ -20,8 +20,8 @@ android {
         applicationId "ch.dissem.apps.${appName.toLowerCase()}"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 20
+        versionCode 22
-        versionName "1.0-beta20"
+        versionName "1.0-rc1"
         multiDexEnabled true
     }
     compileOptions {

app/src/main/java/ch/dissem/apps/abit/ComposeMessageActivity.kt

@@ -43,13 +43,15 @@ class ComposeMessageActivity : AppCompatActivity() {
             setHomeButtonEnabled(false)
         }
 
-        // Display the fragment as the main content.
+        if (supportFragmentManager.findFragmentById(R.id.content) == null) {
-        val fragment = ComposeMessageFragment()
+            // Display the fragment as the main content.
-        fragment.arguments = intent.extras
+            val fragment = ComposeMessageFragment()
-        supportFragmentManager
+            fragment.arguments = intent.extras
-            .beginTransaction()
+            supportFragmentManager
-            .replace(R.id.content, fragment)
+                .beginTransaction()
-            .commit()
+                .replace(R.id.content, fragment)
+                .commit()
+        }
     }
 
     companion object {
@@ -63,10 +65,13 @@ class ComposeMessageActivity : AppCompatActivity() {
         const val EXTRA_PARENT = "ch.dissem.abit.Message.PARENT"
 
         fun launchReplyTo(fragment: Fragment, item: Plaintext) =
-            fragment.startActivity(getReplyIntent(
+            fragment.startActivity(
-                ctx = fragment.activity ?: throw IllegalStateException("Fragment not attached to an activity"),
+                getReplyIntent(
-                item = item
+                    ctx = fragment.activity
-            ))
+                        ?: throw IllegalStateException("Fragment not attached to an activity"),
+                    item = item
+                )
+            )
 
         fun launchReplyTo(activity: Activity, item: Plaintext) =
             activity.startActivity(getReplyIntent(activity, item))
@@ -90,15 +95,20 @@ class ComposeMessageActivity : AppCompatActivity() {
             }
             replyIntent.putExtra(EXTRA_PARENT, item)
             item.subject?.let { subject ->
-                val prefix: String = if (subject.length >= 3 && subject.substring(0, 3).equals("RE:", ignoreCase = true)) {
+                val prefix: String = if (subject.length >= 3 && subject.substring(0, 3).equals(
+                        "RE:",
+                        ignoreCase = true
+                    )) {
                     ""
                 } else {
                     "RE: "
                 }
                 replyIntent.putExtra(EXTRA_SUBJECT, prefix + subject)
             }
-            replyIntent.putExtra(EXTRA_CONTENT,
+            replyIntent.putExtra(
-                "\n\n------------------------------------------------------\n" + item.text!!)
+                EXTRA_CONTENT,
+                "\n\n------------------------------------------------------\n" + item.text!!
+            )
             return replyIntent
         }
     }

app/src/main/java/ch/dissem/apps/abit/ComposeMessageFragment.kt

@@ -63,6 +63,7 @@ class ComposeMessageFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        retainInstance = true
         arguments?.apply {
             val draft = getSerializable(EXTRA_DRAFT) as Plaintext?
             if (draft != null) {
@@ -266,6 +267,14 @@ class ComposeMessageFragment : Fragment() {
         super.onPause()
     }
 
+    override fun onDestroyView() {
+        identity = sender_input.selectedItem as BitmessageAddress
+        // recipient is set when one is selected
+        subject = subject_input.text?.toString() ?: ""
+        content = body_input.text?.toString() ?: ""
+        super.onDestroyView()
+    }
+
     private fun send() {
         val ctx = activity ?: throw IllegalStateException("Fragment is not attached to an activity")
         if (recipient == null) {

app/src/main/java/ch/dissem/apps/abit/adapter/ContactAdapter.kt

@@ -114,6 +114,13 @@ class ContactAdapter(
                         }.invoke()
                     }
 
+                if (newValues.isEmpty()) {
+                    try {
+                        newValues.add(BitmessageAddress(prefix.toString()))
+                    } catch (_: Exception) {
+                    }
+                }
+
                 results.values = newValues
                 results.count = newValues.size
             } else {
@@ -134,4 +141,6 @@ class ContactAdapter(
             }
         }
     }
+
+    fun indexOf(element: BitmessageAddress) = originalData.indexOf(element)
 }