gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

reformat code

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-11-26 13:35:01 +01:00
parent 8e6072bbc7
commit c7fd94ba9b
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
View File

@ -775,9 +775,8 @@ class ConversationsListActivity :
) )
} }
private fun hasActivityActionSendIntent(): Boolean { private fun hasActivityActionSendIntent(): Boolean =
return Intent.ACTION_SEND == intent.action || Intent.ACTION_SEND_MULTIPLE == intent.action Intent.ACTION_SEND == intent.action || Intent.ACTION_SEND_MULTIPLE == intent.action
}
private fun showSearchView(searchView: SearchView?, searchItem: MenuItem?) { private fun showSearchView(searchView: SearchView?, searchItem: MenuItem?) {
binding.conversationListAppbar.stateListAnimator = AnimatorInflater.loadStateListAnimator( binding.conversationListAppbar.stateListAnimator = AnimatorInflater.loadStateListAnimator(
@ -1286,10 +1285,9 @@ class ConversationsListActivity :
!participantPermissions.canIgnoreLobby() !participantPermissions.canIgnoreLobby()
} }
private fun isReadOnlyConversation(conversation: ConversationModel): Boolean { private fun isReadOnlyConversation(conversation: ConversationModel): Boolean =
return conversation.conversationReadOnlyState === conversation.conversationReadOnlyState ===
ConversationEnums.ConversationReadOnlyState.CONVERSATION_READ_ONLY ConversationEnums.ConversationReadOnlyState.CONVERSATION_READ_ONLY
}
private fun handleSharedData() { private fun handleSharedData() {
collectDataFromIntent() collectDataFromIntent()
@ -1525,8 +1523,11 @@ class ConversationsListActivity :
val serverNotificationAppInstalled = val serverNotificationAppInstalled =
userManager.currentUser.blockingGet().capabilities?.notificationsCapability?.features?.isNotEmpty() ?: false userManager.currentUser.blockingGet().capabilities?.notificationsCapability?.features?.isNotEmpty() ?: false
val settingsOfUserAreWrong = notificationPermissionNotGranted || batteryOptimizationNotIgnored || val settingsOfUserAreWrong = notificationPermissionNotGranted ||
messagesChannelNotEnabled || callsChannelNotEnabled || !serverNotificationAppInstalled batteryOptimizationNotIgnored ||
messagesChannelNotEnabled ||
callsChannelNotEnabled ||
!serverNotificationAppInstalled
val userWantsToBeNotifiedAboutWrongSettings = appPreferences.getShowNotificationWarning() val userWantsToBeNotifiedAboutWrongSettings = appPreferences.getShowNotificationWarning()

9
app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt
View File

@ -103,7 +103,9 @@ import javax.inject.Inject
@Suppress("LargeClass", "TooManyFunctions") @Suppress("LargeClass", "TooManyFunctions")
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class SettingsActivity : BaseActivity(), SetPhoneNumberDialogFragment.SetPhoneNumberDialogClickListener { class SettingsActivity :
BaseActivity(),
SetPhoneNumberDialogFragment.SetPhoneNumberDialogClickListener {
private lateinit var binding: ActivitySettingsBinding private lateinit var binding: ActivitySettingsBinding
@Inject @Inject
@ -713,8 +715,8 @@ class SettingsActivity : BaseActivity(), SetPhoneNumberDialogFragment.SetPhoneNu
startActivity(intent) startActivity(intent)
} }
private fun getRingtoneName(context: Context, ringtoneUri: Uri?): String { private fun getRingtoneName(context: Context, ringtoneUri: Uri?): String =
return if (ringtoneUri == null) { if (ringtoneUri == null) {
resources!!.getString(R.string.nc_settings_no_ringtone) resources!!.getString(R.string.nc_settings_no_ringtone)
} else if ((NotificationUtils.DEFAULT_CALL_RINGTONE_URI == ringtoneUri.toString()) || } else if ((NotificationUtils.DEFAULT_CALL_RINGTONE_URI == ringtoneUri.toString()) ||
(NotificationUtils.DEFAULT_MESSAGE_RINGTONE_URI == ringtoneUri.toString()) (NotificationUtils.DEFAULT_MESSAGE_RINGTONE_URI == ringtoneUri.toString())
@ -724,7 +726,6 @@ class SettingsActivity : BaseActivity(), SetPhoneNumberDialogFragment.SetPhoneNu
val r = RingtoneManager.getRingtone(context, ringtoneUri) val r = RingtoneManager.getRingtone(context, ringtoneUri)
r.getTitle(context) r.getTitle(context)
} }
}
private fun themeSwitchPreferences() { private fun themeSwitchPreferences() {
binding.run { binding.run {

2
app/src/main/java/com/nextcloud/talk/utils/DrawableUtils.kt
View File

@ -162,7 +162,7 @@ object DrawableUtils {
} }
} }
@Suppress("MagicNumber") @Suppress("MagicNumber", "TooGenericExceptionCaught")
fun blinkDrawable(rippleView: Drawable) { fun blinkDrawable(rippleView: Drawable) {
try { try {
(rippleView as RippleDrawable).let { rippleDrawable -> (rippleView as RippleDrawable).let { rippleDrawable ->