Merge pull request #207 from hannesa2/UseLatestTopicAsDefault

Use latest topic as default
hannesa2 · Sep 12, 2021 · d736451 · d736451
2 parents 8eca33e + 7232480
commit d736451
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/...edSample/src/main/java/info/mqtt/android/extsample/adapter/SubscriptionListItemAdapter.kt b/...edSample/src/main/java/info/mqtt/android/extsample/adapter/SubscriptionListItemAdapter.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import info.mqtt.android.extsample.R
 import info.mqtt.android.extsample.databinding.SubscriptionListItemBinding
+import info.mqtt.android.extsample.fragments.PublishFragment
 import info.mqtt.android.extsample.internal.Connection
 import info.mqtt.android.extsample.model.Subscription
 
@@ -26,15 +27,15 @@ class SubscriptionListItemAdapter(context: Context, private val connection: Conn
         var row = convertView
 
         if (row == null) {
-            val inflater =
-                context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+            val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
             binding = SubscriptionListItemBinding.inflate(inflater, parent, false)
             row = binding.root
         } else {
             binding = SubscriptionListItemBinding.bind(row)
         }
 
         binding.messageText.text = connection.getSubscriptions()[position].topic
+        PublishFragment.DEFAULT_TOPIC = connection.getSubscriptions()[position].topic
         binding.qosLabel.text = "Qos: ${connection.getSubscriptions()[position].qos}(${connection.getSubscriptions()[position].qos.value})"
         val notifyString = context.getString(R.string.notify_text, connection.getSubscriptions()[position].isEnableNotifications.toString())
         binding.showNotificationsLabel.text = notifyString

diff --git a/extendedSample/src/main/java/info/mqtt/android/extsample/fragments/PublishFragment.kt b/extendedSample/src/main/java/info/mqtt/android/extsample/fragments/PublishFragment.kt
@@ -39,7 +39,7 @@ class PublishFragment : Fragment() {
         _binding = FragmentPublishBinding.inflate(inflater, container, false)
         val view = binding.root
 
-        binding.topic.setText(DEFAULT_TOTPIC)
+        binding.topic.setText(DEFAULT_TOPIC)
 
         binding.qosSpinner.onItemSelectedListener = object : OnItemSelectedListener {
 
@@ -76,6 +76,6 @@ class PublishFragment : Fragment() {
     }
 
     companion object {
-        private const val DEFAULT_TOTPIC = "/test"
+        var DEFAULT_TOPIC = "/test"
     }
 }
diff --git a/extendedSample/src/main/java/info/mqtt/android/extsample/fragments/SubscriptionFragment.kt b/extendedSample/src/main/java/info/mqtt/android/extsample/fragments/SubscriptionFragment.kt
@@ -1,27 +1,27 @@
 package info.mqtt.android.extsample.fragments
 
-import info.mqtt.android.extsample.internal.Connections.Companion.getInstance
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.ViewGroup
-import info.mqtt.android.extsample.adapter.SubscriptionListItemAdapter
-import timber.log.Timber
-import org.eclipse.paho.client.mqttv3.MqttException
-import android.widget.AdapterView.OnItemSelectedListener
 import android.view.View
+import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.*
+import android.widget.AdapterView
+import android.widget.AdapterView.OnItemSelectedListener
+import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import info.mqtt.android.extsample.ActivityConstants
 import info.mqtt.android.extsample.R
+import info.mqtt.android.extsample.adapter.SubscriptionListItemAdapter
 import info.mqtt.android.extsample.databinding.FragmentSubscriptionsBinding
 import info.mqtt.android.extsample.databinding.SubscriptionDialogBinding
 import info.mqtt.android.extsample.internal.Connection
+import info.mqtt.android.extsample.internal.Connections.Companion.getInstance
 import info.mqtt.android.extsample.model.Subscription
-import java.util.HashMap
-import android.widget.ArrayAdapter
 import info.mqtt.android.service.QoS
+import org.eclipse.paho.client.mqttv3.MqttException
+import timber.log.Timber
+import java.util.*
 
 
 class SubscriptionFragment : Fragment() {
@@ -51,8 +51,7 @@ class SubscriptionFragment : Fragment() {
     }
 
     private fun showInputDialog() {
-        val dialogBinding = SubscriptionDialogBinding
-            .inflate(LayoutInflater.from(context))
+        val dialogBinding = SubscriptionDialogBinding.inflate(LayoutInflater.from(context))
 
         val adapter = ArrayAdapter(requireActivity(), android.R.layout.simple_spinner_dropdown_item, QoS.values())
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)