app/src/main/java/de/kuschku/quasseldroid/ui/setup/user/UserSetupIdentitySlide.kt

@@ -19,6 +19,7 @@
 
 package de.kuschku.quasseldroid.ui.setup.user
 
+import android.content.Context
 import android.os.Bundle
 import android.text.Editable
 import android.view.LayoutInflater
@@ -27,12 +28,14 @@ import android.view.ViewGroup
 import android.widget.EditText
 import com.google.android.material.textfield.TextInputLayout
 import de.kuschku.quasseldroid.R
+import de.kuschku.quasseldroid.ui.chat.ChatActivity
 import de.kuschku.quasseldroid.ui.setup.SlideFragment
 import de.kuschku.quasseldroid.util.Patterns
 import de.kuschku.quasseldroid.util.TextValidator
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatSerializer
 import de.kuschku.quasseldroid.util.listener.LinkClickListener
+import de.kuschku.quasseldroid.util.listener.QuasselLinkClickListener
 import javax.inject.Inject
 
 class UserSetupIdentitySlide : SlideFragment() {
@@ -71,6 +74,17 @@ class UserSetupIdentitySlide : SlideFragment() {
     data.putString("realname", ircFormatSerializer.toEscapeCodes(realnameField.text))
   }
 
+  override fun onAttach(context: Context) {
+    super.onAttach(context)
+    linkClickListener = QuasselLinkClickListener(internalLinkClickListener) {
+      activity?.let {
+        if (it !is ChatActivity) {
+          it.finish()
+        }
+      }
+    }
+  }
+
   override fun onCreateContent(inflater: LayoutInflater, container: ViewGroup?,
                                savedInstanceState: Bundle?): View {
     val view = inflater.inflate(R.layout.setup_user_identity, container, false)

lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt

@@ -30,6 +30,7 @@ import de.kuschku.libquassel.quassel.syncables.interfaces.ISyncableObject
 import de.kuschku.libquassel.quassel.syncables.interfaces.invokers.Invokers
 import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
 import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.DEBUG
+import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.ERROR
 import java.io.Closeable
 
 abstract class ProtocolHandler(
@@ -117,6 +118,7 @@ abstract class ProtocolHandler(
   open fun onInitStatusChanged(progress: Int, total: Int) {}
 
   override fun handle(f: SignalProxyMessage.SyncMessage): Boolean {
+    try {
       val obj = objectStorage.get(f.className, f.objectName) ?: if (isInitializing) {
         syncQueue.add(f)
         return true
@@ -142,6 +144,9 @@ abstract class ProtocolHandler(
           currentCallSlot = ""
         }
       }
+    } catch (e: Exception) {
+      log(ERROR, "ProtocolHandler", "Exception occurred while processing $f", e)
+    }
     return true
   }