jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix some code style issues

Browse source
This commit is contained in:
Naveen Singh 2025-01-04 16:09:37 +05:30
parent 68b00e94d9
commit b920dbd482
No known key found for this signature in database
GPG key ID: AF5D43C216778C0B
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/org/fossify/messages/adapters/ThreadAdapter.kt
View file

@ -506,7 +506,11 @@ class ThreadAdapter(
private fun setupDateTime(view: View, dateTime: ThreadDateTime) { private fun setupDateTime(view: View, dateTime: ThreadDateTime) {
ItemThreadDateTimeBinding.bind(view).apply { ItemThreadDateTimeBinding.bind(view).apply {
threadDateTime.apply { threadDateTime.apply {
text = dateTime.date.formatDateOrTime(context, hideTimeAtOtherDays = false, showYearEvenIfCurrent = false) text = (dateTime.date * 1000L).formatDateOrTime(
context = context,
hideTimeOnOtherDays = false,
showCurrentYear = false
)
setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize) setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize)
} }
threadDateTime.setTextColor(textColor) threadDateTime.setTextColor(textColor)

2
app/src/main/kotlin/org/fossify/messages/dialogs/InvalidNumberDialog.kt
View file

@ -12,7 +12,7 @@ class InvalidNumberDialog(val activity: BaseSimpleActivity, val text: String) {
} }
activity.getAlertDialogBuilder() activity.getAlertDialogBuilder()
.setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> { } } .setPositiveButton(org.fossify.commons.R.string.ok) { _, _ -> }
.apply { .apply {
activity.setupDialogStuff(binding.root, this) activity.setupDialogStuff(binding.root, this)
} }

7
app/src/main/kotlin/org/fossify/messages/helpers/MessagesImporter.kt
View file

@ -155,7 +155,10 @@ class MessagesImporter(private val activity: SimpleActivity) {
refreshMessages() refreshMessages()
} }
when { when {
messagesFailed > 0 && messagesImported > 0 -> activity.toast(org.fossify.commons.R.string.importing_some_entries_failed) messagesFailed > 0 && messagesImported > 0 -> {
activity.toast(org.fossify.commons.R.string.importing_some_entries_failed)
}
messagesFailed > 0 -> activity.toast(org.fossify.commons.R.string.importing_failed) messagesFailed > 0 -> activity.toast(org.fossify.commons.R.string.importing_failed)
else -> activity.toast(org.fossify.commons.R.string.importing_successful) else -> activity.toast(org.fossify.commons.R.string.importing_successful)
} }
@ -212,7 +215,7 @@ class MessagesImporter(private val activity: SimpleActivity) {
private fun isXmlMimeType(mimeType: String): Boolean { private fun isXmlMimeType(mimeType: String): Boolean {
return mimeType.equals("application/xml", ignoreCase = true) || mimeType.equals( return mimeType.equals("application/xml", ignoreCase = true) || mimeType.equals(
"text/xml", other = "text/xml",
ignoreCase = true ignoreCase = true
) )
} }

25
app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
View file

@ -6,11 +6,20 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.klinker.android.send_message.MmsReceivedReceiver import com.klinker.android.send_message.MmsReceivedReceiver
import org.fossify.commons.extensions.* import org.fossify.commons.extensions.baseConfig
import org.fossify.commons.extensions.getMyContactsCursor
import org.fossify.commons.extensions.isNumberBlocked
import org.fossify.commons.extensions.normalizePhoneNumber
import org.fossify.commons.extensions.showErrorToast
import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.SimpleContactsHelper
import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.messages.R import org.fossify.messages.R
import org.fossify.messages.extensions.* import org.fossify.messages.extensions.conversationsDB
import org.fossify.messages.extensions.getConversations
import org.fossify.messages.extensions.getLatestMMS
import org.fossify.messages.extensions.insertOrUpdateConversation
import org.fossify.messages.extensions.showReceivedMessageNotification
import org.fossify.messages.extensions.updateUnreadCountBadge
import org.fossify.messages.helpers.ReceiverUtils.isMessageFilteredOut import org.fossify.messages.helpers.ReceiverUtils.isMessageFilteredOut
import org.fossify.messages.helpers.refreshMessages import org.fossify.messages.helpers.refreshMessages
import org.fossify.messages.models.Message import org.fossify.messages.models.Message
@ -43,7 +52,9 @@ class MmsReceiver : MmsReceivedReceiver() {
} }
} }
override fun onError(context: Context, error: String) = context.showErrorToast(context.getString(R.string.couldnt_download_mms)) override fun onError(context: Context, error: String) {
context.showErrorToast(context.getString(R.string.couldnt_download_mms))
}
private fun handleMmsMessage( private fun handleMmsMessage(
context: Context, context: Context,
@ -67,7 +78,13 @@ class MmsReceiver : MmsReceivedReceiver() {
} }
Handler(Looper.getMainLooper()).post { Handler(Looper.getMainLooper()).post {
context.showReceivedMessageNotification(mms.id, address, mms.body, mms.threadId, glideBitmap) context.showReceivedMessageNotification(
messageId = mms.id,
address = address,
body = mms.body,
threadId = mms.threadId,
bitmap = glideBitmap
)
val conversation = context.getConversations(mms.threadId).firstOrNull() ?: return@post val conversation = context.getConversations(mms.threadId).firstOrNull() ?: return@post
ensureBackgroundThread { ensureBackgroundThread {
context.insertOrUpdateConversation(conversation) context.insertOrUpdateConversation(conversation)