From 0ac500924257156ccc1b096f6099c88cc9989808 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 10 Mar 2022 16:55:55 +0100 Subject: [PATCH] reformat kotlin Signed-off-by: Andy Scherzinger --- .../controllers/AccountVerificationController.kt | 4 +++- .../controllers/RingtoneSelectionController.kt | 14 +++++++------- .../talk/controllers/WebViewLoginController.kt | 15 +++++++-------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt index 3074aaa9d..4e8b3549d 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt @@ -161,7 +161,9 @@ class AccountVerificationController(args: Bundle? = null) : RouterTransaction.with( WebViewLoginController( baseUrl, - false, username, "" + false, + username, + "" ) ) .pushChangeHandler(HorizontalChangeHandler()) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt index ecb8c0669..e7f3bbb5f 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt @@ -56,7 +56,8 @@ class RingtoneSelectionController(args: Bundle) : NewBaseController( R.layout.controller_generic_rv, args - ), FlexibleAdapter.OnItemClickListener { + ), + FlexibleAdapter.OnItemClickListener { private val binding: ControllerGenericRvBinding by viewBinding(ControllerGenericRvBinding::bind) private var adapter: FlexibleAdapter<*>? = null @@ -108,9 +109,8 @@ class RingtoneSelectionController(args: Bundle) : var preferencesString: String? = null if (callNotificationSounds && TextUtils.isEmpty(appPreferences!!.callRingtoneUri.also { preferencesString = it }) || - !callNotificationSounds && TextUtils.isEmpty( - appPreferences!!.messageRingtoneUri.also { preferencesString = it } - ) + !callNotificationSounds && + TextUtils.isEmpty(appPreferences!!.messageRingtoneUri.also { preferencesString = it }) ) { adapter!!.toggleSelection(1) foundDefault = true @@ -127,8 +127,8 @@ class RingtoneSelectionController(args: Bundle) : var notificationSoundItem: NotificationSoundItem? for (i in 2 until adapter!!.itemCount) { notificationSoundItem = adapter!!.getItem(i) as NotificationSoundItem? - if (notificationSoundItem!!.notificationSoundUri == ringtoneSettings.getRingtoneUri() - .toString() + if ( + notificationSoundItem!!.notificationSoundUri == ringtoneSettings.getRingtoneUri().toString() ) { adapter!!.toggleSelection(i) break @@ -250,4 +250,4 @@ class RingtoneSelectionController(args: Bundle) : override val title: String get() = resources!!.getString(R.string.nc_settings_notification_sounds) -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt index a3724915c..f32cee0e0 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt @@ -56,9 +56,7 @@ import com.nextcloud.talk.databinding.ControllerWebViewLoginBinding import com.nextcloud.talk.events.CertificateEvent import com.nextcloud.talk.jobs.PushRegistrationWorker import com.nextcloud.talk.models.LoginData -import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.utils.DisplayUtils -import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_BASE_URL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ORIGINAL_PROTOCOL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_TOKEN @@ -129,12 +127,13 @@ class WebViewLoginController(args: Bundle? = null) : NewBaseController( private val webLoginUserAgent: String get() = ( - Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) - + Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) - + " " - + Build.MODEL - + " (" - + resources!!.getString(R.string.nc_app_product_name) + ")" + Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) + + Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + + " " + + Build.MODEL + + " (" + + resources!!.getString(R.string.nc_app_product_name) + + ")" ) @SuppressLint("SetJavaScriptEnabled")