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

kotlin code foermatting

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-03-01 09:53:05 +01:00
parent 4340191b52
commit b750f41efd
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -255,7 +255,8 @@ class AccountVerificationController(args: Bundle? = null) :
registerForPush()
} else {
activity!!.runOnUiThread {
binding.progressText.text = """
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_push_disabled)}
""".trimIndent()
@ -266,12 +267,11 @@ class AccountVerificationController(args: Bundle? = null) :
@SuppressLint("SetTextI18n")
override fun onError(e: Throwable) {
binding.progressText.text = """
binding.progressText.text =
"""
${binding.progressText.text}
""".trimIndent() +
resources!!.getString(
R.string.nc_display_name_not_stored
)
resources!!.getString(R.string.nc_display_name_not_stored)
abortVerification()
}
@ -303,7 +303,8 @@ class AccountVerificationController(args: Bundle? = null) :
} else {
if (activity != null) {
activity!!.runOnUiThread {
binding.progressText.text = """
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_display_name_not_fetched)}
""".trimIndent()
@ -317,7 +318,8 @@ class AccountVerificationController(args: Bundle? = null) :
override fun onError(e: Throwable) {
if (activity != null) {
activity!!.runOnUiThread {
binding.progressText.text = """
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_display_name_not_fetched)}
""".trimIndent()
@ -348,8 +350,9 @@ class AccountVerificationController(args: Bundle? = null) :
if (eventStatus.eventType == EventStatus.EventType.PUSH_REGISTRATION) {
if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood && activity != null) {
activity!!.runOnUiThread {
binding.progressText!!.text = """
${binding.progressText!!.text}
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_push_disabled)}
""".trimIndent()
}
@ -359,8 +362,9 @@ class AccountVerificationController(args: Bundle? = null) :
if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
if (activity != null) {
activity!!.runOnUiThread {
binding.progressText!!.text = """
${binding.progressText!!.text}
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_capabilities_failed)}
""".trimIndent()
}
@ -373,8 +377,9 @@ class AccountVerificationController(args: Bundle? = null) :
if (internalAccountId == eventStatus.userId && !eventStatus.isAllGood) {
if (activity != null) {
activity!!.runOnUiThread {
binding.progressText!!.text = """
${binding.progressText!!.text}
binding.progressText.text =
"""
${binding.progressText.text}
${resources!!.getString(R.string.nc_external_server_failed)}
""".trimIndent()
}

19
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt
View File

@ -49,12 +49,7 @@ import com.nextcloud.talk.utils.ShareUtils
import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.database.user.UserUtils
import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder
import com.vanniktech.emoji.EmojiImageView
import com.vanniktech.emoji.EmojiPopup
import com.vanniktech.emoji.emoji.Emoji
import com.vanniktech.emoji.listeners.OnEmojiClickListener
import com.vanniktech.emoji.listeners.OnEmojiPopupDismissListener
import com.vanniktech.emoji.listeners.OnEmojiPopupShownListener
import org.greenrobot.eventbus.EventBus
import org.parceler.Parcels
import org.parceler.Parcels.unwrap
@ -143,8 +138,11 @@ class EntryMenuController(args: Bundle) :
binding.okButton.alpha = 1.0f
}
binding.textInputLayout.isErrorEnabled = false
} else if ((binding.textEdit.text.toString().startsWith("http://") ||
binding.textEdit.text.toString().startsWith("https://")) &&
} else if (
(
binding.textEdit.text.toString().startsWith("http://") ||
binding.textEdit.text.toString().startsWith("https://")
) &&
binding.textEdit.text.toString().contains("/call/")
) {
if (!binding.okButton.isEnabled) {
@ -274,9 +272,12 @@ class EntryMenuController(args: Bundle) :
} else if (operation === ConversationOperationEnum.OPS_CODE_SHARE_LINK) {
if (activity != null) {
shareIntent?.putExtra(
Intent.EXTRA_TEXT, ShareUtils.getStringForIntent(
Intent.EXTRA_TEXT,
ShareUtils.getStringForIntent(
activity,
binding.textEdit.text.toString(), userUtils, conversation
binding.textEdit.text.toString(),
userUtils,
conversation
)
)
val intent = Intent(shareIntent)