gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-14 16:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

reformat kotlin

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-03-10 16:55:55 +01:00
parent 6b7dd29b07
commit 0ac5009242
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.kt
View File

@ -161,7 +161,9 @@ class AccountVerificationController(args: Bundle? = null) :
RouterTransaction.with( RouterTransaction.with(
WebViewLoginController( WebViewLoginController(
baseUrl, baseUrl,
false, username, "" false,
username,
""
) )
) )
.pushChangeHandler(HorizontalChangeHandler()) .pushChangeHandler(HorizontalChangeHandler())

12
app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.kt
View File

@ -56,7 +56,8 @@ class RingtoneSelectionController(args: Bundle) :
NewBaseController( NewBaseController(
R.layout.controller_generic_rv, R.layout.controller_generic_rv,
args args
), FlexibleAdapter.OnItemClickListener { ),
FlexibleAdapter.OnItemClickListener {
private val binding: ControllerGenericRvBinding by viewBinding(ControllerGenericRvBinding::bind) private val binding: ControllerGenericRvBinding by viewBinding(ControllerGenericRvBinding::bind)
private var adapter: FlexibleAdapter<*>? = null private var adapter: FlexibleAdapter<*>? = null
@ -108,9 +109,8 @@ class RingtoneSelectionController(args: Bundle) :
var preferencesString: String? = null var preferencesString: String? = null
if (callNotificationSounds && if (callNotificationSounds &&
TextUtils.isEmpty(appPreferences!!.callRingtoneUri.also { preferencesString = it }) || TextUtils.isEmpty(appPreferences!!.callRingtoneUri.also { preferencesString = it }) ||
!callNotificationSounds && TextUtils.isEmpty( !callNotificationSounds &&
appPreferences!!.messageRingtoneUri.also { preferencesString = it } TextUtils.isEmpty(appPreferences!!.messageRingtoneUri.also { preferencesString = it })
)
) { ) {
adapter!!.toggleSelection(1) adapter!!.toggleSelection(1)
foundDefault = true foundDefault = true
@ -127,8 +127,8 @@ class RingtoneSelectionController(args: Bundle) :
var notificationSoundItem: NotificationSoundItem? var notificationSoundItem: NotificationSoundItem?
for (i in 2 until adapter!!.itemCount) { for (i in 2 until adapter!!.itemCount) {
notificationSoundItem = adapter!!.getItem(i) as NotificationSoundItem? notificationSoundItem = adapter!!.getItem(i) as NotificationSoundItem?
if (notificationSoundItem!!.notificationSoundUri == ringtoneSettings.getRingtoneUri() if (
.toString() notificationSoundItem!!.notificationSoundUri == ringtoneSettings.getRingtoneUri().toString()
) { ) {
adapter!!.toggleSelection(i) adapter!!.toggleSelection(i)
break break

15
app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.kt
View File

@ -56,9 +56,7 @@ import com.nextcloud.talk.databinding.ControllerWebViewLoginBinding
import com.nextcloud.talk.events.CertificateEvent import com.nextcloud.talk.events.CertificateEvent
import com.nextcloud.talk.jobs.PushRegistrationWorker import com.nextcloud.talk.jobs.PushRegistrationWorker
import com.nextcloud.talk.models.LoginData import com.nextcloud.talk.models.LoginData
import com.nextcloud.talk.models.database.UserEntity
import com.nextcloud.talk.utils.DisplayUtils 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_BASE_URL
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ORIGINAL_PROTOCOL import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ORIGINAL_PROTOCOL
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_TOKEN
@ -129,12 +127,13 @@ class WebViewLoginController(args: Bundle? = null) : NewBaseController(
private val webLoginUserAgent: String private val webLoginUserAgent: String
get() = ( get() = (
Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) +
+ Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) +
+ " " " " +
+ Build.MODEL Build.MODEL +
+ " (" " (" +
+ resources!!.getString(R.string.nc_app_product_name) + ")" resources!!.getString(R.string.nc_app_product_name) +
")"
) )
@SuppressLint("SetJavaScriptEnabled") @SuppressLint("SetJavaScriptEnabled")