ssh: survive empty ip (fixes #1910) (#1927)

Co-authored-by: dogi <[email protected]>

Author: Okuro3499

.github/workflows/android-release.yml

@@ -72,16 +72,16 @@ jobs:
           sha256sum output/remote.aab > output/remote.aab.sha256
           ls -alR output
 
-#      - name: publish AAB to playstore
-#       if: github.ref == 'refs/heads/master'
-#        uses: dogi/[email protected]
-#        with:
-#          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-#          packageName: io.treehouses.remote
-#          releaseFiles: output/remote.aab
-#          track: internal
-#          releaseName: "${{ env.VERSION }}"
-#          status: completed
+      - name: publish AAB to playstore
+        if: github.ref == 'refs/heads/master'
+        uses: dogi/[email protected]
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: io.treehouses.remote
+          releaseFiles: output/remote.aab
+          track: internal
+          releaseName: "${{ env.VERSION }}"
+          status: completed
 
 #      - name: mobile security framework
 #        run: |

app/src/main/kotlin/io/treehouses/remote/fragments/SSHConfigFragment.kt

@@ -24,10 +24,9 @@ import io.treehouses.remote.utils.SaveUtils
 import io.treehouses.remote.utils.Utils.toast
 import io.treehouses.remote.utils.logD
 
-
 class SSHConfigFragment : BaseSSHConfig() {
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         bind = DialogSshBinding.inflate(inflater, container, false)
         if (listener.getChatService().state == Constants.STATE_CONNECTED) {
             listener.sendMessage(getString(R.string.TREEHOUSES_NETWORKMODE_INFO))
@@ -42,24 +41,24 @@ class SSHConfigFragment : BaseSSHConfig() {
         addTextValidation()
         Tutorials.sshTutorial(bind, requireActivity())
         bind.connectSsh.setOnClickListener {
-            var uriString = bind.sshTextInput.text.toString()
+            val uriString = bind.sshTextInput.text.toString()
             connect(uriString, false)
         }
         setUpAdapter()
         bind.generateKeys.setOnClickListener { SSHKeyGenFragment().show(childFragmentManager, "GenerateKey") }
         bind.smartConnect.setOnClickListener {
             val shouldConnect = checkForSmartConnectKey()
-            var uriString = bind.sshTextInput.text.toString()
+            val uriString = bind.sshTextInput.text.toString()
             if (shouldConnect) connect(uriString, true)
         }
         bind.showKeys.setOnClickListener { SSHAllKeyFragment().show(childFragmentManager, "AllKeys") }
     }
 
     private fun checkForSmartConnectKey(): Boolean {
         if (!KeyUtils.getAllKeyNames(requireContext()).contains("SmartConnectKey")) {
-            if (listener?.getChatService()?.state == Constants.STATE_CONNECTED) {
+            if (listener.getChatService().state == Constants.STATE_CONNECTED) {
                 val key = KeyUtils.createSmartConnectKey(requireContext())
-                listener?.sendMessage(getString(R.string.TREEHOUSES_SSHKEY_ADD, getOpenSSH(key)))
+                listener.sendMessage(getString(R.string.TREEHOUSES_SSHKEY_ADD, getOpenSSH(key)))
             } else {
                 context.toast("Bluetooth not connected. Could not send key to Pi.")
                 return false
@@ -115,14 +114,18 @@ class SSHConfigFragment : BaseSSHConfig() {
             bind.sshTextInput.setText(hostAddress)
             logD("GOT IP $ipAddress")
         } else if (s.contains("ip") || s.startsWith("essid")) {
-            val ipString = s.split(", ")[1]
-            val ipAddress = ipString.substring(4)
-            val hostAddress = "pi@$ipAddress"
-            bind.sshTextInput.setText(hostAddress)
-            logD("GOT IP $ipAddress")
+            val splitResult = s.split(", ")
+            if (splitResult.size > 1) {
+                val ipString = splitResult[1]
+                if (ipString.startsWith("ip:")) {
+                    val ipAddress = ipString.substring(4)
+                    val hostAddress = "pi@$ipAddress"
+                    bind.sshTextInput.setText(hostAddress)
+                    logD("GOT IP $ipAddress")
+                }
+            }
         }
     }
-
     override fun getMessage(msg: Message) {
         when (msg.what) {
             Constants.MESSAGE_READ -> {