From eaab88776530f8baa55fc6d497d9a932261c9e3d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 28 Apr 2022 21:18:29 +0200 Subject: [PATCH] refactor duplicated code Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/activities/MainActivity.kt | 50 ++++++++----------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 06be3d52d..c3ca78e90 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -118,42 +118,32 @@ class MainActivity : BaseActivity(), ActionBarProvider { if (userUtils.anyUserExists()) { setDefaultRootController() } else { - if (!TextUtils.isEmpty(resources.getString(R.string.weblogin_url))) { - router!!.pushController( - RouterTransaction.with( - WebViewLoginController(resources.getString(R.string.weblogin_url), false) - ) - .pushChangeHandler(HorizontalChangeHandler()) - .popChangeHandler(HorizontalChangeHandler()) - ) - } else { - router!!.setRoot( - RouterTransaction.with(ServerSelectionController()) - .pushChangeHandler(HorizontalChangeHandler()) - .popChangeHandler(HorizontalChangeHandler()) - ) - } + launchLoginScreen() } } else { - if (!TextUtils.isEmpty(resources.getString(R.string.weblogin_url))) { - router!!.pushController( - RouterTransaction.with( - WebViewLoginController(resources.getString(R.string.weblogin_url), false) - ) - .pushChangeHandler(HorizontalChangeHandler()) - .popChangeHandler(HorizontalChangeHandler()) - ) - } else { - router!!.setRoot( - RouterTransaction.with(ServerSelectionController()) - .pushChangeHandler(HorizontalChangeHandler()) - .popChangeHandler(HorizontalChangeHandler()) - ) - } + launchLoginScreen() } } } + private fun launchLoginScreen() { + if (!TextUtils.isEmpty(resources.getString(R.string.weblogin_url))) { + router!!.pushController( + RouterTransaction.with( + WebViewLoginController(resources.getString(R.string.weblogin_url), false) + ) + .pushChangeHandler(HorizontalChangeHandler()) + .popChangeHandler(HorizontalChangeHandler()) + ) + } else { + router!!.setRoot( + RouterTransaction.with(ServerSelectionController()) + .pushChangeHandler(HorizontalChangeHandler()) + .popChangeHandler(HorizontalChangeHandler()) + ) + } + } + override fun onStart() { Log.d(TAG, "onStart: Activity: " + System.identityHashCode(this).toString())