Skip to content

Commit a62266d

Browse files
sowjanyakchmahibi
authored andcommitted
parse link properly
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
1 parent 13748e6 commit a62266d

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ import com.nextcloud.talk.utils.UnifiedPushUtils
4343
import com.nextcloud.talk.utils.ShortcutManagerHelper
4444
import com.nextcloud.talk.utils.bundle.BundleKeys
4545
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN
46+
import io.reactivex.SingleObserver
4647
import io.reactivex.android.schedulers.AndroidSchedulers
4748
import io.reactivex.disposables.CompositeDisposable
49+
import io.reactivex.disposables.Disposable
4850
import io.reactivex.schedulers.Schedulers
4951
import javax.inject.Inject
5052

app/src/main/java/com/nextcloud/talk/utils/DeepLinkHandler.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,8 @@ object DeepLinkHandler {
7676
*/
7777
private fun parseAuthority(authority: String): Pair<String?, String> =
7878
if (authority.contains("@")) {
79-
val parts = authority.split("@", limit = 2)
80-
val username = parts[0].takeIf { it.isNotBlank() }
81-
val host = parts.getOrElse(1) { "" }
79+
val username = authority.substringBeforeLast("@").takeIf { it.isNotBlank() }
80+
val host = authority.substringAfterLast("@").takeIf { it.isNotBlank() } ?: ""
8281
Pair(username, host)
8382
} else {
8483
Pair(null, authority)

0 commit comments

Comments
 (0)