From cb74067f5dab8b3595c736058ee1a6693cdc7765 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 7 Jun 2025 15:35:15 -0700 Subject: [PATCH 01/99] Add a notification action to resend a failed message --- .../common/util/NotificationManagerImpl.kt | 21 +++++++++++++++++++ presentation/src/main/res/values/strings.xml | 1 + 2 files changed, 22 insertions(+) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index ca6d84b7..2d962bc0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -53,6 +53,7 @@ import dev.octoshrimpy.quik.receiver.MarkReadReceiver import dev.octoshrimpy.quik.receiver.MarkSeenReceiver import dev.octoshrimpy.quik.receiver.RemoteMessagingReceiver import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver +import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository @@ -371,9 +372,29 @@ class NotificationManagerImpl @Inject constructor( .addNextIntent(contentIntent) val contentPI = taskStackBuilder.getPendingIntent(threadId.toInt(), PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE) + //Action for resending a failed message + val resendIntent = Intent(context, SendSmsReceiver::class.java).apply { + putExtra("id", message.id) + } + val resendPendingIntent = PendingIntent.getBroadcast( + context, + message.id.toInt(), + resendIntent, + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE + ) + + val resendAction = NotificationCompat.Action.Builder( + R.drawable.ic_send_black_24dp, + context.getString(R.string.notification_message_failed_action), + resendPendingIntent + ) + .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_NONE) + .build() + val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId)) .setContentTitle(context.getString(R.string.notification_message_failed_title)) .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle())) + .addAction(resendAction) .setColor(colors.theme(lastRecipient).theme) .setPriority(NotificationManagerCompat.IMPORTANCE_MAX) .setSmallIcon(R.drawable.ic_notification_failed) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 22dde1a4..604ddbc1 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -487,6 +487,7 @@ Message not sent The message to %s failed to send + Resend System From dc83caeb3adbd8ff32cec160af07a196fc368a95 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 7 Jun 2025 15:50:39 -0700 Subject: [PATCH 02/99] Optimize all imports --- .../glide/gifencoder/AnimatedGifEncoder.java | 4 +++- .../QKSMS/repository/PhoneNumberUtilsTest.kt | 2 +- .../blocking/CallBlockerBlockingClient.kt | 1 - .../QKSMS/compat/SubscriptionInfoCompat.kt | 2 -- .../QKSMS/compat/SubscriptionManagerCompat.kt | 1 - .../moez/QKSMS/manager/AlarmManagerImpl.kt | 1 - .../QKSMS/manager/ChangelogManagerImpl.kt | 11 ++-------- .../moez/QKSMS/mapper/CursorToMessageImpl.kt | 5 +++-- .../QKSMS/receiver/BlockThreadReceiver.kt | 2 +- .../com/moez/QKSMS/receiver/BootReceiver.kt | 2 +- .../receiver/DefaultSmsChangedReceiver.kt | 2 +- .../QKSMS/receiver/DeleteMessagesReceiver.kt | 2 +- .../QKSMS/receiver/MarkArchivedReceiver.kt | 2 +- .../moez/QKSMS/receiver/MarkReadReceiver.kt | 2 +- .../moez/QKSMS/receiver/MarkSeenReceiver.kt | 2 +- .../QKSMS/receiver/MmsReceivedReceiver.kt | 2 +- .../moez/QKSMS/receiver/MmsSentReceiver.kt | 2 +- .../moez/QKSMS/receiver/MmsUpdatedReceiver.kt | 2 +- .../moez/QKSMS/receiver/NightModeReceiver.kt | 2 +- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 2 +- .../receiver/SendScheduledMessageReceiver.kt | 2 +- .../moez/QKSMS/receiver/SendSmsReceiver.kt | 2 +- .../QKSMS/receiver/SmsDeliveredReceiver.kt | 2 +- .../receiver/SmsProviderChangedReceiver.kt | 2 +- .../moez/QKSMS/receiver/SmsSentReceiver.kt | 2 +- .../QKSMS/receiver/SpeakThreadsReceiver.kt | 2 +- .../QKSMS/repository/BackupRepositoryImpl.kt | 5 +++-- .../QKSMS/repository/MessageRepositoryImpl.kt | 1 - .../moez/QKSMS/service/AutoDeleteService.kt | 4 +--- .../QKSMS/service/HeadlessSmsSendService.kt | 2 +- .../com/moez/QKSMS/util/NightModeManager.kt | 3 ++- .../com/moez/QKSMS/util/PhoneNumberUtils.kt | 2 +- .../moez/QKSMS/worker/HousekeepingWorker.kt | 2 +- .../moez/QKSMS/manager/ReferralManagerImpl.kt | 4 ---- .../com/moez/QKSMS/experiment/Experiment.kt | 3 ++- .../QKSMS/interactor/AddScheduledMessage.kt | 1 - .../com/moez/QKSMS/interactor/SpeakThreads.kt | 2 -- .../com/moez/QKSMS/manager/ShortcutManager.kt | 1 - .../com/moez/QKSMS/mapper/CursorToMessage.kt | 6 +++-- .../main/java/com/moez/QKSMS/model/Message.kt | 4 +++- .../main/java/com/moez/QKSMS/model/MmsPart.kt | 2 -- .../java/com/moez/QKSMS/model/Recipient.kt | 2 +- .../QKSMS/repository/MessageRepository.kt | 1 - .../xml/messages_text_file_provider_paths.xml | 2 +- .../java/com/moez/QKSMS/common/Navigator.kt | 1 - .../com/moez/QKSMS/common/QKApplication.kt | 22 +++++++++---------- .../DrawerLayoutDrawerOpenedObservable.java | 7 ++++-- .../QKSMS/common/base/QkThemedActivity.kt | 4 ++-- .../moez/QKSMS/common/util/DateFormatter.kt | 3 ++- .../moez/QKSMS/common/util/FileLoggingTree.kt | 4 ++-- .../common/util/QkChooserTargetService.kt | 2 -- .../QKSMS/common/util/ShortcutManagerImpl.kt | 2 +- .../util/extensions/CalendarExtensions.kt | 2 +- .../util/extensions/RecipientExtensions.kt | 4 +++- .../QKSMS/common/widget/PagerTitleView.kt | 4 ++-- .../widget/QkContextMenuRecyclerView.kt | 1 - .../QKSMS/feature/backup/BackupActivity.kt | 2 +- .../QKSMS/feature/backup/BackupPresenter.kt | 7 ++---- .../feature/backup/RestoreBackupService.kt | 2 +- .../feature/blocking/BlockingActivity.kt | 2 +- .../feature/blocking/BlockingPresenter.kt | 4 ++-- .../manager/BlockingManagerPreferenceView.kt | 1 - .../manager/BlockingManagerPresenter.kt | 4 ++-- .../messages/BlockedMessagesPresenter.kt | 5 ++--- .../numbers/BlockedNumbersPresenter.kt | 4 ++-- .../blocking/numbers/BlockedNumbersState.kt | 1 - .../QKSMS/feature/compose/ComposeActivity.kt | 17 ++++++-------- .../feature/compose/ComposeActivityModule.kt | 5 ++--- .../QKSMS/feature/compose/ComposeViewModel.kt | 8 +++---- .../feature/compose/ComposeWindowCallback.kt | 2 -- .../QKSMS/feature/compose/MessagesAdapter.kt | 2 +- .../feature/compose/editing/ChipsAdapter.kt | 3 --- .../QKSMS/feature/compose/part/AudioBinder.kt | 1 - .../QKSMS/feature/compose/part/FileBinder.kt | 3 --- .../feature/compose/part/PartsAdapter.kt | 1 - .../QKSMS/feature/compose/part/VCardBinder.kt | 2 -- .../feature/contacts/ContactsActivity.kt | 5 +---- .../contacts/ContactsActivityModule.kt | 2 +- .../feature/contacts/ContactsViewModel.kt | 5 ++--- .../ConversationInfoActivity.kt | 2 +- .../ConversationInfoController.kt | 4 ++-- .../ConversationInfoPresenter.kt | 5 ++--- .../injection/ConversationInfoComponent.kt | 2 +- .../injection/ConversationInfoModule.kt | 4 ++-- .../conversations/ConversationsAdapter.kt | 3 --- .../QKSMS/feature/gallery/GalleryActivity.kt | 2 +- .../feature/gallery/GalleryActivityModule.kt | 2 +- .../QKSMS/feature/gallery/GalleryViewModel.kt | 7 ++---- .../moez/QKSMS/feature/main/MainActivity.kt | 8 +++---- .../QKSMS/feature/main/MainActivityModule.kt | 4 ++-- .../moez/QKSMS/feature/main/MainViewModel.kt | 11 +++++----- .../NotificationPrefsActivity.kt | 6 ++--- .../NotificationPrefsActivityModule.kt | 2 +- .../NotificationPrefsViewModel.kt | 5 ++--- .../moez/QKSMS/feature/plus/PlusActivity.kt | 2 +- .../QKSMS/feature/plus/PlusActivityModule.kt | 2 +- .../moez/QKSMS/feature/plus/PlusViewModel.kt | 4 ++-- .../experiment/UpgradeButtonExperiment.kt | 1 - .../QKSMS/feature/qkreply/QkReplyActivity.kt | 4 ++-- .../feature/qkreply/QkReplyActivityModule.kt | 2 +- .../QKSMS/feature/qkreply/QkReplyViewModel.kt | 4 ++-- .../feature/scheduled/ScheduledActivity.kt | 3 +-- .../scheduled/ScheduledActivityModule.kt | 2 +- .../feature/scheduled/ScheduledViewModel.kt | 9 ++++---- .../feature/settings/SettingsActivity.kt | 2 +- .../feature/settings/SettingsController.kt | 10 ++++----- .../feature/settings/SettingsPresenter.kt | 7 +++--- .../feature/settings/about/AboutPresenter.kt | 4 ++-- .../settings/swipe/SwipeActionsController.kt | 4 ++-- .../settings/swipe/SwipeActionsPresenter.kt | 5 ++--- .../themepicker/ThemePickerPresenter.kt | 5 ++--- .../injection/ThemePickerComponent.kt | 2 +- .../injection/ThemePickerModule.kt | 4 ++-- .../QKSMS/feature/widget/WidgetAdapter.kt | 1 - .../com/moez/QKSMS/injection/AppComponent.kt | 4 ++-- .../com/moez/QKSMS/injection/AppModule.kt | 8 +++---- .../android/ActivityBuilderModule.kt | 4 ++-- .../android/BroadcastReceiverBuilderModule.kt | 4 ++-- .../injection/android/ServiceBuilderModule.kt | 10 ++++----- .../res/drawable/ic_speech_to_text_black.xml | 3 +-- .../src/main/res/layout/text_input_dialog.xml | 1 - .../main/res/layout/widget_speak_unseen.xml | 2 -- .../moez/QKSMS/common/util/CrashlyticsTree.kt | 1 - 123 files changed, 187 insertions(+), 248 deletions(-) diff --git a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java index c49c8c76..7f1d8593 100644 --- a/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java +++ b/common/src/main/java/com/bumptech/glide/gifencoder/AnimatedGifEncoder.java @@ -4,15 +4,17 @@ package com.bumptech.glide.gifencoder; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import timber.log.Timber; import java.io.BufferedOutputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import timber.log.Timber; + public class AnimatedGifEncoder { // The minimum % of an images pixels that must be transparent for us to set a transparent index diff --git a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt index ce68ceee..01b6b188 100644 --- a/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt +++ b/data/src/androidTest/java/com/moez/QKSMS/repository/PhoneNumberUtilsTest.kt @@ -26,7 +26,7 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import java.util.* +import java.util.Locale @RunWith(AndroidJUnit4::class) class PhoneNumberUtilsTest { diff --git a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt index 76befb70..d1a62ba1 100644 --- a/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt +++ b/data/src/main/java/com/moez/QKSMS/blocking/CallBlockerBlockingClient.kt @@ -28,7 +28,6 @@ import dev.octoshrimpy.quik.extensions.map import io.reactivex.Completable import io.reactivex.Single import timber.log.Timber -import java.util.* import javax.inject.Inject class CallBlockerBlockingClient @Inject constructor( diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt index 1278dedb..80119270 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionInfoCompat.kt @@ -18,8 +18,6 @@ */ package dev.octoshrimpy.quik.compat -import android.annotation.TargetApi -import android.os.Build import android.telephony.SubscriptionInfo data class SubscriptionInfoCompat(private val subscriptionInfo: SubscriptionInfo) { diff --git a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt index 3580da6d..5b4d7e20 100644 --- a/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt +++ b/data/src/main/java/com/moez/QKSMS/compat/SubscriptionManagerCompat.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.compat import android.content.Context -import android.os.Build import android.telephony.SubscriptionManager import dev.octoshrimpy.quik.manager.PermissionManager import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt index 82790999..509fff82 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/AlarmManagerImpl.kt @@ -21,7 +21,6 @@ package dev.octoshrimpy.quik.manager import android.app.PendingIntent import android.content.Context import android.content.Intent -import android.os.Build import dev.octoshrimpy.quik.receiver.SendScheduledMessageReceiver import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt index ee9a87a8..b49c0c18 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ChangelogManagerImpl.kt @@ -20,21 +20,14 @@ package dev.octoshrimpy.quik.manager import android.content.Context import android.util.Log -import dev.octoshrimpy.quik.common.util.extensions.versionCode -import dev.octoshrimpy.quik.util.Preferences import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.squareup.moshi.Moshi import com.squareup.moshi.Types -import io.reactivex.Single -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.schedulers.Schedulers +import dev.octoshrimpy.quik.common.util.extensions.versionCode +import dev.octoshrimpy.quik.util.Preferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import okhttp3.Call -import okhttp3.Callback -import okhttp3.Response -import java.io.IOException import javax.inject.Inject class ChangelogManagerImpl @Inject constructor( diff --git a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt index e6371462..e237d268 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/CursorToMessageImpl.kt @@ -21,11 +21,12 @@ package dev.octoshrimpy.quik.mapper import android.content.Context import android.database.Cursor import android.net.Uri -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import com.google.android.mms.pdu_alt.EncodedStringValue import com.google.android.mms.pdu_alt.PduHeaders import com.google.android.mms.pdu_alt.PduPersister -import dev.octoshrimpy.quik.extensions.map import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.Message diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt index 441a0a6a..ea2c2193 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt @@ -21,11 +21,11 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.interactor.MarkBlocked import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import dagger.android.AndroidInjection import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt index 67f57e51..f20ccf68 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BootReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.UpdateScheduledMessageAlarms import javax.inject.Inject class BootReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt index 796bed0d..0edce8b0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DefaultSmsChangedReceiver.kt @@ -24,9 +24,9 @@ import android.content.Intent import android.os.Build import android.provider.Telephony import androidx.annotation.RequiresApi +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.util.Preferences -import dagger.android.AndroidInjection import javax.inject.Inject class DefaultSmsChangedReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt index 98a862d6..d8b63b06 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/DeleteMessagesReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.DeleteMessages import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.DeleteMessages import javax.inject.Inject class DeleteMessagesReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt index 64767646..2521c34c 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkArchivedReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.MarkArchived import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.MarkArchived import javax.inject.Inject class MarkArchivedReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 507e2b65..1302e5cb 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.MarkRead import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.MarkRead import javax.inject.Inject class MarkReadReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index 9a645ab0..eabdb931 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.MarkSeen import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.MarkSeen import javax.inject.Inject class MarkSeenReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt index 112e31a9..b0865f8b 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsReceivedReceiver.kt @@ -22,8 +22,8 @@ import android.content.Context import android.content.Intent import android.net.Uri import com.klinker.android.send_message.MmsReceivedReceiver -import dev.octoshrimpy.quik.interactor.ReceiveMms import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.ReceiveMms import javax.inject.Inject class MmsReceivedReceiver : MmsReceivedReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt index 7041ad88..ab03334b 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsSentReceiver.kt @@ -29,8 +29,8 @@ import android.provider.Telephony import com.google.android.mms.MmsException import com.google.android.mms.util_alt.SqliteWrapper import com.klinker.android.send_message.Transaction -import dev.octoshrimpy.quik.interactor.SyncMessage import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SyncMessage import timber.log.Timber import java.io.File import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt index 04d39960..d92eff08 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/MmsUpdatedReceiver.kt @@ -22,8 +22,8 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.net.Uri -import dev.octoshrimpy.quik.interactor.SyncMessage import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SyncMessage import javax.inject.Inject class MmsUpdatedReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt index 9167def3..5d0a23af 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/NightModeReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.util.NightModeManager import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.util.NightModeManager import javax.inject.Inject class NightModeReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index b6323e23..3d124d67 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -22,12 +22,12 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import androidx.core.app.RemoteInput +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat import dev.octoshrimpy.quik.interactor.MarkRead import dev.octoshrimpy.quik.interactor.SendMessage import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import dagger.android.AndroidInjection import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt index abfbde20..036f2aac 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SendScheduledMessageReceiver.kt @@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SendScheduledMessage import dev.octoshrimpy.quik.repository.MessageRepository -import dagger.android.AndroidInjection import javax.inject.Inject class SendScheduledMessageReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt index a2c3c3c8..dab2d3a0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SendSmsReceiver.kt @@ -21,9 +21,9 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.RetrySending import dev.octoshrimpy.quik.repository.MessageRepository -import dagger.android.AndroidInjection import javax.inject.Inject class SendSmsReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt index 3faa694e..7d0990a0 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsDeliveredReceiver.kt @@ -22,9 +22,9 @@ import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.MarkDelivered import dev.octoshrimpy.quik.interactor.MarkDeliveryFailed -import dagger.android.AndroidInjection import javax.inject.Inject class SmsDeliveredReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt index 67438325..d4113280 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsProviderChangedReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.SyncMessage import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SyncMessage import javax.inject.Inject /** diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt index 6c4fe35b..ce9adac7 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SmsSentReceiver.kt @@ -22,9 +22,9 @@ import android.app.Activity import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.MarkFailed import dev.octoshrimpy.quik.interactor.MarkSent -import dagger.android.AndroidInjection import javax.inject.Inject class SmsSentReceiver : BroadcastReceiver() { diff --git a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt index d51fec09..2f4b0e95 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/SpeakThreadsReceiver.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import dev.octoshrimpy.quik.interactor.SpeakThreads import dagger.android.AndroidInjection +import dev.octoshrimpy.quik.interactor.SpeakThreads import dev.octoshrimpy.quik.repository.ConversationRepository import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt index ef5469a1..02808d97 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/BackupRepositoryImpl.kt @@ -27,11 +27,11 @@ import android.provider.Telephony import androidx.core.content.contentValuesOf import androidx.core.net.toUri import androidx.documentfile.provider.DocumentFile +import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.common.util.extensions.now import dev.octoshrimpy.quik.model.BackupFile import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.util.Preferences -import com.squareup.moshi.Moshi import io.reactivex.Observable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject @@ -40,7 +40,8 @@ import okio.buffer import okio.source import timber.log.Timber import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale +import java.util.Timer import javax.inject.Inject import javax.inject.Singleton import kotlin.concurrent.schedule diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 67e31cba..5a85406d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -68,7 +68,6 @@ import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton -import kotlin.collections.ArrayList import kotlin.math.sqrt @Singleton diff --git a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt index 537a0fef..b9daaa7e 100644 --- a/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt +++ b/data/src/main/java/com/moez/QKSMS/service/AutoDeleteService.kt @@ -6,13 +6,11 @@ import android.app.job.JobParameters import android.app.job.JobService import android.content.ComponentName import android.content.Context -import androidx.core.content.getSystemService +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.jobScheduler import dev.octoshrimpy.quik.interactor.DeleteOldMessages -import dagger.android.AndroidInjection import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign -import kotlinx.coroutines.Job import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt index ff6ed935..bb2ef5bd 100644 --- a/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt +++ b/data/src/main/java/com/moez/QKSMS/service/HeadlessSmsSendService.kt @@ -22,9 +22,9 @@ import android.app.IntentService import android.content.Intent import android.net.Uri import android.telephony.TelephonyManager +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.interactor.SendMessage import dev.octoshrimpy.quik.repository.ConversationRepository -import dagger.android.AndroidInjection import javax.inject.Inject class HeadlessSmsSendService : IntentService("HeadlessSmsSendService") { diff --git a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt index 0414661e..ccb419e1 100644 --- a/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt +++ b/data/src/main/java/com/moez/QKSMS/util/NightModeManager.kt @@ -26,7 +26,8 @@ import androidx.appcompat.app.AppCompatDelegate import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.receiver.NightModeReceiver import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale import java.util.concurrent.TimeUnit import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt index 408fd84a..474b779f 100644 --- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt @@ -22,7 +22,7 @@ import android.content.Context import android.telephony.PhoneNumberUtils import io.michaelrocks.libphonenumber.android.PhoneNumberUtil import io.michaelrocks.libphonenumber.android.Phonenumber -import java.util.* +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton diff --git a/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt b/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt index d5949a0e..bdc74513 100644 --- a/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt +++ b/data/src/main/java/com/moez/QKSMS/worker/HousekeepingWorker.kt @@ -25,8 +25,8 @@ import androidx.work.PeriodicWorkRequest import androidx.work.WorkManager import androidx.work.Worker import androidx.work.WorkerParameters -import com.moez.QKSMS.util.Constants import com.moez.QKSMS.manager.MediaRecorderManager +import com.moez.QKSMS.util.Constants import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import java.io.File import java.util.concurrent.TimeUnit diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt index ef4dbd1c..2f81c87a 100644 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt @@ -19,11 +19,7 @@ package dev.octoshrimpy.quik.manager -import android.content.Context -import dev.octoshrimpy.quik.util.Preferences -import kotlinx.coroutines.suspendCancellableCoroutine import javax.inject.Inject -import kotlin.coroutines.resume class ReferralManagerImpl @Inject constructor() : ReferralManager { diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt index 51fa95ca..f99e095a 100644 --- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt +++ b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt @@ -21,7 +21,8 @@ package dev.octoshrimpy.quik.experiment import android.content.Context import android.preference.PreferenceManager import dev.octoshrimpy.quik.manager.AnalyticsManager -import java.util.* +import java.util.Locale +import java.util.Random abstract class Experiment(val context: Context, val analytics: AnalyticsManager) { diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index 1c4c7ac2..54096873 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt @@ -23,7 +23,6 @@ import android.content.Context import android.net.Uri import androidx.core.net.toUri import dev.octoshrimpy.quik.extensions.getName -import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import io.reactivex.Flowable import io.realm.RealmList diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt index 900d5a0b..b1557d8f 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SpeakThreads.kt @@ -18,9 +18,7 @@ */ package dev.octoshrimpy.quik.interactor -import android.content.res.Resources import com.moez.QKSMS.manager.SpeakManager -import dev.octoshrimpy.quik.domain.R import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt index 9b7814ff..c6d67395 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt @@ -18,7 +18,6 @@ */ package dev.octoshrimpy.quik.manager -import android.content.pm.ShortcutInfo import androidx.core.content.pm.ShortcutInfoCompat interface ShortcutManager { diff --git a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt index fb6fbad1..936864ed 100644 --- a/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/mapper/CursorToMessage.kt @@ -19,10 +19,12 @@ package dev.octoshrimpy.quik.mapper import android.database.Cursor -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import dev.octoshrimpy.quik.model.Message import timber.log.Timber -import java.util.* +import java.util.Arrays interface CursorToMessage : Mapper, Message> { diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index b7091448..25300368 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -20,7 +20,9 @@ package dev.octoshrimpy.quik.model import android.content.ContentUris import android.net.Uri -import android.provider.Telephony.* +import android.provider.Telephony.Mms +import android.provider.Telephony.MmsSms +import android.provider.Telephony.Sms import dev.octoshrimpy.quik.extensions.joinTo import io.realm.RealmList import io.realm.RealmObject diff --git a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt index 0e13988c..015a71e5 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt @@ -19,10 +19,8 @@ package dev.octoshrimpy.quik.model import android.content.ContentResolver -import android.content.ContentResolver.MimeTypeInfo import android.net.Uri import android.webkit.MimeTypeMap -import androidx.core.net.toUri import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.Index diff --git a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt index 93ad077e..9cc298a0 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Recipient.kt @@ -21,7 +21,7 @@ package dev.octoshrimpy.quik.model import android.telephony.PhoneNumberUtils import io.realm.RealmObject import io.realm.annotations.PrimaryKey -import java.util.* +import java.util.Locale open class Recipient( @PrimaryKey var id: Long = 0, diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt index ba31079a..fa4558bb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageRepository.kt @@ -23,7 +23,6 @@ import dev.octoshrimpy.quik.model.Attachment import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.MmsPart import io.realm.RealmResults -import java.io.File interface MessageRepository { diff --git a/domain/src/main/res/xml/messages_text_file_provider_paths.xml b/domain/src/main/res/xml/messages_text_file_provider_paths.xml index a7b340a3..c9f50c92 100644 --- a/domain/src/main/res/xml/messages_text_file_provider_paths.xml +++ b/domain/src/main/res/xml/messages_text_file_provider_paths.xml @@ -1,3 +1,3 @@ - + diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 42bb477d..77a8ff33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -45,7 +45,6 @@ import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.ScheduledMessage -import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index 51eaf1da..d2a41b94 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -28,17 +28,6 @@ import androidx.work.Configuration import androidx.work.WorkManager import androidx.work.WorkerFactory import com.moez.QKSMS.manager.SpeakManager -import dev.octoshrimpy.quik.R -import dev.octoshrimpy.quik.common.util.CrashlyticsTree -import dev.octoshrimpy.quik.common.util.FileLoggingTree -import dev.octoshrimpy.quik.injection.AppComponentManager -import dev.octoshrimpy.quik.injection.appComponent -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.BillingManager -import dev.octoshrimpy.quik.manager.ReferralManager -import dev.octoshrimpy.quik.migration.QkMigration -import dev.octoshrimpy.quik.migration.QkRealmMigration -import dev.octoshrimpy.quik.util.NightModeManager import com.uber.rxdogtag.RxDogTag import com.uber.rxdogtag.autodispose.AutoDisposeConfigurer import dagger.android.AndroidInjector @@ -46,7 +35,18 @@ import dagger.android.DispatchingAndroidInjector import dagger.android.HasActivityInjector import dagger.android.HasBroadcastReceiverInjector import dagger.android.HasServiceInjector +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.util.CrashlyticsTree +import dev.octoshrimpy.quik.common.util.FileLoggingTree +import dev.octoshrimpy.quik.injection.AppComponentManager +import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.interactor.SpeakThreads +import dev.octoshrimpy.quik.manager.AnalyticsManager +import dev.octoshrimpy.quik.manager.BillingManager +import dev.octoshrimpy.quik.manager.ReferralManager +import dev.octoshrimpy.quik.migration.QkMigration +import dev.octoshrimpy.quik.migration.QkRealmMigration +import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.worker.HousekeepingWorker import io.realm.Realm import io.realm.RealmConfiguration diff --git a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java index 0ed38ae8..fba29ebc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java +++ b/presentation/src/main/java/com/moez/QKSMS/common/androidxcompat/DrawerLayoutDrawerOpenedObservable.java @@ -18,14 +18,17 @@ */ package dev.octoshrimpy.quik.common.androidxcompat; +import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread; + import android.view.View; + import androidx.drawerlayout.widget.DrawerLayout; + import com.jakewharton.rxbinding2.InitialValueObservable; + import io.reactivex.Observer; import io.reactivex.android.MainThreadDisposable; -import static com.jakewharton.rxbinding2.internal.Preconditions.checkMainThread; - final class DrawerLayoutDrawerOpenedObservable extends InitialValueObservable { private final DrawerLayout view; private final int gravity; diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt index d1a3efe3..edd3b493 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt @@ -26,6 +26,8 @@ import android.os.Bundle import android.view.View import androidx.core.view.iterator import androidx.lifecycle.Lifecycle +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.resolveThemeBoolean @@ -36,8 +38,6 @@ import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt index 66eca516..f9d4253e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/DateFormatter.kt @@ -24,7 +24,8 @@ import dev.octoshrimpy.quik.common.util.extensions.isSameDay import dev.octoshrimpy.quik.common.util.extensions.isSameWeek import dev.octoshrimpy.quik.common.util.extensions.isSameYear import java.text.SimpleDateFormat -import java.util.* +import java.util.Calendar +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt index 9660d4f5..bead7e56 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt @@ -21,13 +21,13 @@ package dev.octoshrimpy.quik.common.util import android.content.Context import android.net.Uri import android.util.Log -import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.FileUtils +import dev.octoshrimpy.quik.util.Preferences import io.reactivex.schedulers.Schedulers import timber.log.Timber import java.io.FileNotFoundException import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale import javax.inject.Inject import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt index e25d10e4..652e3c46 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/QkChooserTargetService.kt @@ -21,10 +21,8 @@ package dev.octoshrimpy.quik.common.util import android.content.ComponentName import android.content.IntentFilter import android.graphics.drawable.Icon -import android.os.Build import android.service.chooser.ChooserTarget import android.service.chooser.ChooserTargetService -import androidx.annotation.RequiresApi import androidx.core.os.bundleOf import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.feature.compose.ComposeActivity diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index 44872678..983c480b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt @@ -21,8 +21,8 @@ package dev.octoshrimpy.quik.common.util import android.annotation.TargetApi import android.content.Context import android.content.Intent -import android.os.Build import android.content.pm.ShortcutManager +import android.os.Build import androidx.core.app.Person import androidx.core.content.pm.ShortcutInfoCompat import androidx.core.content.pm.ShortcutManagerCompat diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt index 358d5ece..e772b795 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/CalendarExtensions.kt @@ -18,7 +18,7 @@ */ package dev.octoshrimpy.quik.common.util.extensions -import java.util.* +import java.util.Calendar fun Calendar.isSameDay(other: Calendar): Boolean { return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt index 06d1ee92..0cbad1c3 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/RecipientExtensions.kt @@ -8,7 +8,9 @@ import android.provider.ContactsContract import android.util.TypedValue import android.view.Gravity import android.view.LayoutInflater -import android.view.View.* +import android.view.View.GONE +import android.view.View.MeasureSpec +import android.view.View.VISIBLE import android.widget.FrameLayout import android.widget.ImageView import androidx.core.app.Person diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index ac620afe..3b8a3031 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -25,6 +25,8 @@ import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.TextView import androidx.viewpager.widget.ViewPager +import com.uber.autodispose.android.ViewScopeProvider +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.forEach @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.extensions.Optional import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.ViewScopeProvider -import com.uber.autodispose.autoDisposable import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.tab_view.view.* diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt index 91844393..b748146e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkContextMenuRecyclerView.kt @@ -1,7 +1,6 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context -import android.net.Uri import android.util.AttributeSet import android.view.ContextMenu import android.view.View diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index b35c901d..8c7e7ba5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index b8f03570..a2eaefd7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -19,7 +19,8 @@ package dev.octoshrimpy.quik.feature.backup import android.content.Context -import androidx.core.net.toUri +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -28,13 +29,9 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.interactor.PerformBackup import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.BackupRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers -import timber.log.Timber import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt index 15bd9925..063ed4a4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/RestoreBackupService.kt @@ -26,10 +26,10 @@ import android.net.Uri import android.os.IBinder import androidx.core.app.NotificationManagerCompat import androidx.core.content.ContextCompat +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.getLabel import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.repository.BackupRepository -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.schedulers.Schedulers import timber.log.Timber diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt index 850f4b7e..a30f4863 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* class BlockingActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt index cf15688d..147d2a63 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingPresenter.kt @@ -19,12 +19,12 @@ package dev.octoshrimpy.quik.feature.blocking import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt index 9a777070..c1576ec7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt @@ -27,7 +27,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import dev.octoshrimpy.quik.R -import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.setVisible import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index deda746b..f5d5a815 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt @@ -1,6 +1,8 @@ package dev.octoshrimpy.quik.feature.blocking.manager import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.CallBlockerBlockingClient @@ -12,8 +14,6 @@ import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt index f92ebb09..ab4e1a33 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesPresenter.kt @@ -18,15 +18,14 @@ */ package dev.octoshrimpy.quik.feature.blocking.messages +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.DeleteConversations import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class BlockedMessagesPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt index 1045aeb9..af749104 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersPresenter.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.feature.blocking.numbers +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.interactor.MarkUnblocked import dev.octoshrimpy.quik.repository.BlockingRepository import dev.octoshrimpy.quik.repository.ConversationRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt index e59d3668..d9ae7337 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersState.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.feature.blocking.numbers import dev.octoshrimpy.quik.model.BlockedNumber -import io.realm.RealmList import io.realm.RealmResults data class BlockedNumbersState( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 81a50fba..9c07846f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -43,11 +43,9 @@ import android.view.DragEvent.ACTION_DROP import android.view.Menu import android.view.MenuItem import android.view.View -import android.widget.Toast import android.widget.SeekBar -import androidx.activity.result.contract.ActivityResultContracts +import android.widget.Toast import androidx.appcompat.app.AlertDialog -import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat @@ -78,7 +76,6 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.util.extensions.showKeyboard import dev.octoshrimpy.quik.common.widget.MicInputCloudView import dev.octoshrimpy.quik.common.widget.QkEditText -import dev.octoshrimpy.quik.common.widget.TextInputDialog import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.feature.compose.editing.ChipsAdapter import dev.octoshrimpy.quik.feature.contacts.ContactsActivity @@ -93,11 +90,14 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.attach import kotlinx.android.synthetic.main.compose_activity.attachAFileIcon import kotlinx.android.synthetic.main.compose_activity.attachAFileLabel +import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon +import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel import kotlinx.android.synthetic.main.compose_activity.attaching -import kotlinx.android.synthetic.main.compose_activity.shadeBackground import kotlinx.android.synthetic.main.compose_activity.audioMsgAbort import kotlinx.android.synthetic.main.compose_activity.audioMsgAttach import kotlinx.android.synthetic.main.compose_activity.audioMsgBackground +import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth +import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerBackground import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerPlayPause import kotlinx.android.synthetic.main.compose_activity.audioMsgPlayerSeekBar @@ -114,14 +114,10 @@ import kotlinx.android.synthetic.main.compose_activity.gallery import kotlinx.android.synthetic.main.compose_activity.galleryLabel import kotlinx.android.synthetic.main.compose_activity.loading import kotlinx.android.synthetic.main.compose_activity.message +import kotlinx.android.synthetic.main.compose_activity.messageAttachments import kotlinx.android.synthetic.main.compose_activity.messageList import kotlinx.android.synthetic.main.compose_activity.messagesEmpty import kotlinx.android.synthetic.main.compose_activity.noValidRecipients -import kotlinx.android.synthetic.main.compose_activity.messageAttachments -import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageIcon -import kotlinx.android.synthetic.main.compose_activity.attachAnAudioMessageLabel -import kotlinx.android.synthetic.main.compose_activity.audioMsgBluetooth -import kotlinx.android.synthetic.main.compose_activity.audioMsgDuration import kotlinx.android.synthetic.main.compose_activity.recordAudioMsg import kotlinx.android.synthetic.main.compose_activity.schedule import kotlinx.android.synthetic.main.compose_activity.scheduleLabel @@ -132,6 +128,7 @@ import kotlinx.android.synthetic.main.compose_activity.send import kotlinx.android.synthetic.main.compose_activity.sendAsGroup import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground import kotlinx.android.synthetic.main.compose_activity.sendAsGroupSwitch +import kotlinx.android.synthetic.main.compose_activity.shadeBackground import kotlinx.android.synthetic.main.compose_activity.sim import kotlinx.android.synthetic.main.compose_activity.simIndex import kotlinx.android.synthetic.main.compose_activity.speechToTextFrame diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt index d04f5cf2..5afc54bc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt @@ -21,12 +21,11 @@ package dev.octoshrimpy.quik.feature.compose import android.content.Intent import android.net.Uri import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey -import dev.octoshrimpy.quik.model.Attachment import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap -import java.net.URLDecoder +import dev.octoshrimpy.quik.injection.ViewModelKey +import dev.octoshrimpy.quik.model.Attachment import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 9a0fa998..572bd434 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -26,8 +26,8 @@ import android.net.Uri import android.os.Vibrator import android.telephony.SmsMessage import android.widget.Toast -import androidx.core.content.getSystemService import androidx.core.content.FileProvider +import androidx.core.content.getSystemService import androidx.core.net.toFile import com.google.android.exoplayer2.util.MimeTypes import com.moez.QKSMS.common.QkMediaPlayer @@ -48,7 +48,6 @@ import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.common.widget.MicInputCloudView import dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerView import dev.octoshrimpy.quik.compat.SubscriptionManagerCompat -import dev.octoshrimpy.quik.compat.TelephonyCompat import dev.octoshrimpy.quik.extensions.asObservable import dev.octoshrimpy.quik.extensions.isImage import dev.octoshrimpy.quik.extensions.isSmil @@ -74,9 +73,9 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable +import dev.octoshrimpy.quik.util.FileUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences -import dev.octoshrimpy.quik.util.FileUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -89,7 +88,8 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import timber.log.Timber import java.text.SimpleDateFormat -import java.util.* +import java.util.Locale +import java.util.UUID import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt index 514cd9e3..3cc37569 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeWindowCallback.kt @@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.compose import android.app.Activity import android.graphics.Rect -import android.os.Build import android.view.ActionMode import android.view.KeyEvent import android.view.Menu @@ -31,7 +30,6 @@ import android.view.View import android.view.Window import android.view.WindowManager import android.view.accessibility.AccessibilityEvent -import androidx.annotation.RequiresApi import dev.octoshrimpy.quik.feature.compose.editing.DetailedChipView class ComposeWindowCallback( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index c5f7153a..7aa6ea93 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -73,8 +73,8 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.* -import kotlinx.android.synthetic.main.message_list_item_in.parts import kotlinx.android.synthetic.main.message_list_item_in.body +import kotlinx.android.synthetic.main.message_list_item_in.parts import kotlinx.android.synthetic.main.message_list_item_in.sim import kotlinx.android.synthetic.main.message_list_item_in.simIndex import kotlinx.android.synthetic.main.message_list_item_in.status diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 9ac1f07f..67489994 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.feature.compose.editing import android.content.Context -import android.os.Build import android.view.LayoutInflater import android.view.ViewGroup import android.widget.RelativeLayout @@ -28,8 +27,6 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter import dev.octoshrimpy.quik.common.base.QkViewHolder import dev.octoshrimpy.quik.common.util.extensions.dpToPx -import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor -import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.model.Recipient import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt index 4c10e10d..8e10e288 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/AudioBinder.kt @@ -25,7 +25,6 @@ import android.media.MediaMetadataRetriever import android.view.View import android.widget.SeekBar import com.moez.QKSMS.common.QkMediaPlayer -import com.moez.QKSMS.contentproviders.MmsPartProvider import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewHolder diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt index a5990a09..da54cfdd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/FileBinder.kt @@ -20,9 +20,6 @@ package dev.octoshrimpy.quik.feature.compose.part import android.annotation.SuppressLint import android.content.Context -import android.view.Gravity -import android.widget.FrameLayout -import com.moez.QKSMS.contentproviders.MmsPartProvider import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewHolder diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt index f5491e5f..292def32 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/PartsAdapter.kt @@ -18,7 +18,6 @@ */ package dev.octoshrimpy.quik.feature.compose.part -import android.net.Uri import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt index 1bf1cd74..9d0eb635 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/part/VCardBinder.kt @@ -19,8 +19,6 @@ package dev.octoshrimpy.quik.feature.compose.part import android.content.Context -import android.view.Gravity -import android.widget.FrameLayout import androidx.core.view.isVisible import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkViewHolder diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index f1a3e85a..4792d559 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -20,19 +20,17 @@ package dev.octoshrimpy.quik.feature.contacts import android.app.Activity import android.content.Intent -import android.os.Build import android.os.Bundle import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.editorActions import com.jakewharton.rxbinding2.widget.textChanges +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.ViewModelFactory import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.hideKeyboard -import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor -import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.showKeyboard import dev.octoshrimpy.quik.common.widget.QkDialog import dev.octoshrimpy.quik.extensions.Optional @@ -40,7 +38,6 @@ import dev.octoshrimpy.quik.feature.compose.editing.ComposeItem import dev.octoshrimpy.quik.feature.compose.editing.ComposeItemAdapter import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberAction import dev.octoshrimpy.quik.feature.compose.editing.PhoneNumberPickerAdapter -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt index 5a3f62fe..12783cf0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.contacts import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey @Module class ContactsActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt index 3dbcad44..80fe0ec6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.contacts import android.view.inputmethod.EditorInfo +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.base.QkViewModel import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.extensions.removeAccents @@ -35,12 +37,9 @@ import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.realm.RealmList import kotlinx.coroutines.runBlocking diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt index bf8cb5b0..16069617 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* class ConversationInfoActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index 032e59ac..e8a6c66a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -22,6 +22,8 @@ import android.view.View import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.GridLayoutManager import com.bluelinelabs.conductor.RouterTransaction +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.QkChangeHandler @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingDialog import dev.octoshrimpy.quik.feature.conversationinfo.injection.ConversationInfoModule import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index fcd3a6c5..f642444f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.conversationinfo import android.content.Context import androidx.lifecycle.Lifecycle +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -36,12 +38,9 @@ import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt index 35cfdb03..80255a12 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt @@ -18,9 +18,9 @@ */ package dev.octoshrimpy.quik.feature.conversationinfo.injection +import dagger.Subcomponent import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController import dev.octoshrimpy.quik.injection.scope.ControllerScope -import dagger.Subcomponent @ControllerScope @Subcomponent(modules = [ConversationInfoModule::class]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt index 7edc22ec..7fde018b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt @@ -18,10 +18,10 @@ */ package dev.octoshrimpy.quik.feature.conversationinfo.injection -import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController -import dev.octoshrimpy.quik.injection.scope.ControllerScope import dagger.Module import dagger.Provides +import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoController +import dev.octoshrimpy.quik.injection.scope.ControllerScope import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index b7fcdcda..ec51803f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -22,10 +22,7 @@ import android.content.Context import android.graphics.Typeface import android.view.LayoutInflater import android.view.ViewGroup -import androidx.core.text.bold import androidx.core.text.buildSpannedString -import androidx.core.text.color -import androidx.core.view.isInvisible import androidx.core.view.isVisible import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt index 1329b315..2189035b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivity.kt @@ -29,12 +29,12 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkActivity import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.model.MmsPart -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt index a0d28c03..09a77518 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryActivityModule.kt @@ -20,10 +20,10 @@ package dev.octoshrimpy.quik.feature.gallery import android.content.Intent import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt index 1438bf0a..1d5e46eb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryViewModel.kt @@ -20,6 +20,8 @@ package dev.octoshrimpy.quik.feature.gallery import android.content.Context import com.moez.QKSMS.contentproviders.MmsPartProvider +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -29,13 +31,8 @@ import dev.octoshrimpy.quik.interactor.SaveImage import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.common.widget.QkContextMenuRecyclerView -import dev.octoshrimpy.quik.model.MmsPart import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 458282cd..fed83338 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -41,6 +41,9 @@ import androidx.recyclerview.widget.ItemTouchHelper import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.androidxcompat.drawerOpen @@ -52,16 +55,13 @@ import dev.octoshrimpy.quik.common.util.extensions.scrapViews import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.common.widget.TextInputDialog import dev.octoshrimpy.quik.feature.blocking.BlockingDialog import dev.octoshrimpy.quik.feature.changelog.ChangelogDialog import dev.octoshrimpy.quik.feature.conversations.ConversationItemTouchCallback import dev.octoshrimpy.quik.feature.conversations.ConversationsAdapter import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.repository.SyncRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dagger.android.AndroidInjection -import dev.octoshrimpy.quik.common.widget.TextInputDialog import io.reactivex.Observable import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt index 41e8358a..b877251b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivityModule.kt @@ -19,11 +19,11 @@ package dev.octoshrimpy.quik.feature.main import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey -import dev.octoshrimpy.quik.injection.scope.ActivityScope import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey +import dev.octoshrimpy.quik.injection.scope.ActivityScope import io.reactivex.disposables.CompositeDisposable @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index fb4c108f..5da9edcf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.main import androidx.recyclerview.widget.ItemTouchHelper +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -32,6 +34,7 @@ import dev.octoshrimpy.quik.interactor.MarkUnarchived import dev.octoshrimpy.quik.interactor.MarkUnpinned import dev.octoshrimpy.quik.interactor.MarkUnread import dev.octoshrimpy.quik.interactor.MigratePreferences +import dev.octoshrimpy.quik.interactor.SpeakThreads import dev.octoshrimpy.quik.interactor.SyncContacts import dev.octoshrimpy.quik.interactor.SyncMessages import dev.octoshrimpy.quik.listener.ContactAddedListener @@ -41,21 +44,17 @@ import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.manager.RatingManager import dev.octoshrimpy.quik.model.SyncLog import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.interactor.SpeakThreads -import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import io.realm.Realm import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import java.util.* +import java.util.Locale import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt index 37ecdbf5..0d5cac73 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivity.kt @@ -28,15 +28,15 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dagger.android.AndroidInjection import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt index fe5d93e3..ce1873d1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.notificationprefs import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt index 39b531bb..101ae910 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/notificationprefs/NotificationPrefsViewModel.kt @@ -21,17 +21,16 @@ package dev.octoshrimpy.quik.feature.notificationprefs import android.content.Context import android.media.RingtoneManager import android.net.Uri +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Flowable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 4434362e..a2277f86 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -24,6 +24,7 @@ import androidx.core.view.children import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity @@ -36,7 +37,6 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment import dev.octoshrimpy.quik.manager.BillingManager -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.collapsing_toolbar.* import kotlinx.android.synthetic.main.preference_view.view.* import kotlinx.android.synthetic.main.qksms_plus_activity.* diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt index b0b1f814..b1ec4d7b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.plus import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey @Module class PlusActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index 8b18658f..53e9c68f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.feature.plus +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index 8bd11468..1d38c371 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.feature.plus.experiment import android.content.Context -import androidx.annotation.StringRes import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.experiment.Experiment import dev.octoshrimpy.quik.experiment.Variant diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index ab20b9b4..9362fc76 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -38,14 +38,14 @@ import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.widget.textChanges +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.autoScrollToStart import dev.octoshrimpy.quik.common.util.extensions.setVisible -import dev.octoshrimpy.quik.feature.compose.MessagesAdapter -import dagger.android.AndroidInjection import dev.octoshrimpy.quik.common.util.extensions.showKeyboard import dev.octoshrimpy.quik.common.widget.QkEditText +import dev.octoshrimpy.quik.feature.compose.MessagesAdapter import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.compose_activity.message diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt index 0f5639d9..3dcb5785 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.qkreply import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt index 318265c0..dc96cf9b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyViewModel.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.qkreply import android.telephony.SmsMessage +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel @@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.withLatestFrom diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 6319c13c..73aaa7df 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -18,7 +18,6 @@ */ package dev.octoshrimpy.quik.feature.scheduled -import android.graphics.Typeface import android.os.Bundle import android.view.Menu import android.view.MenuItem @@ -26,11 +25,11 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint -import dagger.android.AndroidInjection import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.main_activity.toolbar diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt index 7938364e..03735b05 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt @@ -19,10 +19,10 @@ package dev.octoshrimpy.quik.feature.scheduled import androidx.lifecycle.ViewModel -import dev.octoshrimpy.quik.injection.ViewModelKey import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap +import dev.octoshrimpy.quik.injection.ViewModelKey @Module class ScheduledActivityModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 5c6c50f3..035c414c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -1,19 +1,18 @@ package dev.octoshrimpy.quik.feature.scheduled import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel +import dev.octoshrimpy.quik.common.util.ClipboardUtils +import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import dev.octoshrimpy.quik.interactor.SendScheduledMessage import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.ScheduledMessageRepository -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.common.util.ClipboardUtils -import dev.octoshrimpy.quik.interactor.DeleteScheduledMessages import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt index 8af3e12e..c41ce9d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsActivity.kt @@ -22,9 +22,9 @@ import android.os.Bundle import com.bluelinelabs.conductor.Conductor import com.bluelinelabs.conductor.Router import com.bluelinelabs.conductor.RouterTransaction +import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import dagger.android.AndroidInjection import kotlinx.android.synthetic.main.container_activity.* class SettingsActivity : QkThemedActivity() { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt index 2e93f785..e8a2812c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt @@ -30,6 +30,8 @@ import com.bluelinelabs.conductor.RouterTransaction import com.google.android.material.snackbar.Snackbar import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.view.longClicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.MenuItem @@ -49,18 +51,16 @@ import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.suspendCancellableCoroutine -import kotlinx.coroutines.withContext import kotlinx.android.synthetic.main.settings_controller.* import kotlinx.android.synthetic.main.settings_controller.view.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* import kotlinx.android.synthetic.main.settings_theme_widget.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext import javax.inject.Inject import kotlin.coroutines.resume diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 22bb75c9..154dd666 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -19,6 +19,8 @@ package dev.octoshrimpy.quik.feature.settings import android.content.Context +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter @@ -34,14 +36,11 @@ import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.service.AutoDeleteService import dev.octoshrimpy.quik.util.NightModeManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.runBlocking import timber.log.Timber -import java.util.* +import java.util.Calendar import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt index 70a9a358..6e0716d6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/about/AboutPresenter.kt @@ -18,11 +18,11 @@ */ package dev.octoshrimpy.quik.feature.settings.about +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import javax.inject.Inject class AboutPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt index 04d0d2a2..b8ac743d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsController.kt @@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.view.View import androidx.core.view.isVisible import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.base.QkController @@ -29,8 +31,6 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.injection.appComponent -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.Observable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt index 704c351a..6d4e729a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/swipe/SwipeActionsPresenter.kt @@ -20,13 +20,12 @@ package dev.octoshrimpy.quik.feature.settings.swipe import android.content.Context import androidx.annotation.DrawableRes +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject class SwipeActionsPresenter @Inject constructor( diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt index f0b417ac..7c7ab313 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerPresenter.kt @@ -19,16 +19,15 @@ package dev.octoshrimpy.quik.feature.themepicker import com.f2prateek.rx.preferences2.Preference +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.WidgetManager import dev.octoshrimpy.quik.util.Preferences -import com.uber.autodispose.android.lifecycle.scope -import com.uber.autodispose.autoDisposable import io.reactivex.rxkotlin.Observables -import io.reactivex.rxkotlin.withLatestFrom import javax.inject.Inject import javax.inject.Named diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt index 3dc5dc81..43efb701 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerComponent.kt @@ -18,9 +18,9 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection +import dagger.Subcomponent import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController import dev.octoshrimpy.quik.injection.scope.ControllerScope -import dagger.Subcomponent @ControllerScope @Subcomponent(modules = [ThemePickerModule::class]) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt index baccefcf..9336025e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/injection/ThemePickerModule.kt @@ -18,10 +18,10 @@ */ package dev.octoshrimpy.quik.feature.themepicker.injection -import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController -import dev.octoshrimpy.quik.injection.scope.ControllerScope import dagger.Module import dagger.Provides +import dev.octoshrimpy.quik.feature.themepicker.ThemePickerController +import dev.octoshrimpy.quik.injection.scope.ControllerScope import javax.inject.Named @Module diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index 1a5f91c8..14e4c00a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -27,7 +27,6 @@ import android.widget.RemoteViews import android.widget.RemoteViewsService import androidx.core.text.bold import androidx.core.text.buildSpannedString -import androidx.core.text.color import androidx.core.text.italic import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index b5596cab..2fe2a806 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection +import dagger.Component +import dagger.android.support.AndroidSupportInjectionModule import dev.octoshrimpy.quik.common.QKApplication import dev.octoshrimpy.quik.common.QkDialog import dev.octoshrimpy.quik.common.util.QkChooserTargetService @@ -43,8 +45,6 @@ import dev.octoshrimpy.quik.feature.widget.WidgetAdapter import dev.octoshrimpy.quik.injection.android.ActivityBuilderModule import dev.octoshrimpy.quik.injection.android.BroadcastReceiverBuilderModule import dev.octoshrimpy.quik.injection.android.ServiceBuilderModule -import dagger.Component -import dagger.android.support.AndroidSupportInjectionModule import javax.inject.Singleton @Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index a37cf052..d34cd3a2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -26,6 +26,10 @@ import android.preference.PreferenceManager import androidx.lifecycle.ViewModelProvider import androidx.work.WorkerFactory import com.f2prateek.rx.preferences2.RxSharedPreferences +import com.squareup.moshi.Moshi +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import dagger.Module +import dagger.Provides import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.BlockingManager import dev.octoshrimpy.quik.common.ViewModelFactory @@ -85,10 +89,6 @@ import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.repository.ScheduledMessageRepositoryImpl import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.repository.SyncRepositoryImpl -import com.squareup.moshi.Moshi -import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import dagger.Module -import dagger.Provides import dev.octoshrimpy.quik.worker.InjectionWorkerFactory import javax.inject.Singleton diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt index 516372d4..69eda914 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.backup.BackupActivity import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity @@ -39,8 +41,6 @@ import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivityModule import dev.octoshrimpy.quik.feature.settings.SettingsActivity import dev.octoshrimpy.quik.injection.scope.ActivityScope -import dagger.Module -import dagger.android.ContributesAndroidInjector @Module abstract class ActivityBuilderModule { diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt index c9019938..f8ef1057 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/BroadcastReceiverBuilderModule.kt @@ -18,6 +18,8 @@ */ package dev.octoshrimpy.quik.injection.android +import dagger.Module +import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.feature.widget.WidgetProvider import dev.octoshrimpy.quik.injection.scope.ActivityScope import dev.octoshrimpy.quik.receiver.BlockThreadReceiver @@ -38,8 +40,6 @@ import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsProviderChangedReceiver import dev.octoshrimpy.quik.receiver.SmsReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver -import dagger.Module -import dagger.android.ContributesAndroidInjector import dev.octoshrimpy.quik.receiver.SpeakThreadsReceiver import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt index 36fa1e90..b8e38fc7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ServiceBuilderModule.kt @@ -18,13 +18,13 @@ */ package dev.octoshrimpy.quik.injection.android -import dev.octoshrimpy.quik.feature.backup.RestoreBackupService -import dev.octoshrimpy.quik.injection.scope.ActivityScope -import dev.octoshrimpy.quik.service.HeadlessSmsSendService -import dev.octoshrimpy.quik.receiver.SendSmsReceiver -import dev.octoshrimpy.quik.service.AutoDeleteService import dagger.Module import dagger.android.ContributesAndroidInjector +import dev.octoshrimpy.quik.feature.backup.RestoreBackupService +import dev.octoshrimpy.quik.injection.scope.ActivityScope +import dev.octoshrimpy.quik.receiver.SendSmsReceiver +import dev.octoshrimpy.quik.service.AutoDeleteService +import dev.octoshrimpy.quik.service.HeadlessSmsSendService @Module abstract class ServiceBuilderModule { diff --git a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml index 48de1c61..2339d38d 100644 --- a/presentation/src/main/res/drawable/ic_speech_to_text_black.xml +++ b/presentation/src/main/res/drawable/ic_speech_to_text_black.xml @@ -1,6 +1,5 @@ - . --> diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt index 6beae05f..da897ad9 100644 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt @@ -19,7 +19,6 @@ package dev.octoshrimpy.quik.common.util import timber.log.Timber -import javax.inject.Inject class CrashlyticsTree : Timber.Tree() { From 132517549e06d9e97daa571c9953034e34657da5 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 9 Jun 2025 12:14:58 -0700 Subject: [PATCH 03/99] Build debug build automatically with a debug key. No need to comment out that signing code!! --- presentation/build.gradle | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index c5f87ee6..454ef398 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -40,6 +40,7 @@ android { } signingConfigs { + debug // Uses the default debug keystore. release { def keystoreProps = new Properties() def keystorePropsFile = rootProject.file('./.gradle/.gradlerc') @@ -47,16 +48,13 @@ android { keyAlias 'quik_release' if (keystorePropsFile.exists()) { keystoreProps.load(new FileInputStream(keystorePropsFile)) - } else if (System.getenv("CI") == "true") { -// do nothing - } else { - throw new GradleException("Keystore properties file not found.") - } + } else + // do nothing storePassword keystoreProps['storePassword'] keyPassword keystoreProps['keyPassword'] } } - + dependenciesInfo { // Disables dependency metadata when building APKs. includeInApk = false @@ -75,6 +73,7 @@ android { applicationIdSuffix ".debug" versionNameSuffix "-debug" resValue("string", "app_name", "QUIK-Debug") + signingConfig signingConfigs.debug } } @@ -87,13 +86,12 @@ android { jvmTarget = "1.8" } - productFlavors { withAnalytics { dimension "analytics" } noAnalytics { - signingConfig signingConfigs.release } } + lint { abortOnError false } @@ -233,3 +231,13 @@ if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithA apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' } + +// Check to make sure that the keystore file is present when building a release +gradle.taskGraph.whenReady { taskGraph -> + if ((taskGraph.hasTask(':assembleRelease') || + taskGraph.allTasks.any { it.name == 'assembleRelease' }) && + !file('./.gradle/.gradlerc').exists() && + System.getenv("CI") != "true") { + throw new GradleException("Keystore properties file not found") + } +} \ No newline at end of file From 90c790cc23f08716ba39306b33bbd63dc8cf95ad Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 9 Jun 2025 16:01:30 -0700 Subject: [PATCH 04/99] Remove section about modifying build files in contributing.md. --- CONTRIBUTING.md | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8ce56229..d9cfc78e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,43 +41,5 @@ To update the wiki, simply navigate to the [wiki tab](https://github.com/octoshr 6. Submit a pull request with your change. **We have a build action on each pull request, if this build fails, please edit the pull request in order to make the build succeed.** ## Helpful Tips -### [build.gradle](https://github.com/octoshrimpy/quik/blob/master/presentation/build.gradle) configuration for building locally -``` - -/* - signingConfigs { - release { - def keystoreProps = new Properties() - def keystorePropsFile = rootProject.file('./.gradle/.gradlerc') - storeFile file('./my-release-key.keystore') - keyAlias 'quik_release' - if (keystorePropsFile.exists()) { - keystoreProps.load(new FileInputStream(keystorePropsFile)) - } else if (System.getenv("CI") == "true") { -// do nothing - } else { - throw new GradleException("Keystore properties file not found.") - } - storePassword keystoreProps['storePassword'] - keyPassword keystoreProps['keyPassword'] - } - } -*/ - buildTypes { - release { - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - // signingConfig signingConfigs.release - } - } - - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { - // signingConfig signingConfigs.release - } - } -``` ### Set Java Version When building QUIK, make sure to download JDK 17 and specify an installation path for it. In Android Studio, you can do that in Settings > Build, Execution, Deployment > Build Tools > Gradle. From 4d23674409c85e505b1ab3d22cdd11a6cfe41955 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 9 Jun 2025 17:07:33 -0700 Subject: [PATCH 05/99] Cancel resend notification on action completed --- .../main/java/com/moez/QKSMS/interactor/RetrySending.kt | 8 +++++++- .../java/com/moez/QKSMS/manager/NotificationManager.kt | 2 ++ .../com/moez/QKSMS/common/util/NotificationManagerImpl.kt | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt index 825cdd8b..598c17d4 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/RetrySending.kt @@ -19,12 +19,16 @@ package dev.octoshrimpy.quik.interactor import dev.octoshrimpy.quik.extensions.mapNotNull +import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { +class RetrySending @Inject constructor( + private val messageRepo: MessageRepository, + private val notificationManager: NotificationManager +) : Interactor() { override fun buildObservable(params: Long): Flowable { return Flowable.just(params) @@ -35,6 +39,8 @@ class RetrySending @Inject constructor(private val messageRepo: MessageRepositor true -> messageRepo.sendSms(message) false -> messageRepo.resendMms(message) } + val threadId = message.threadId + notificationManager.cancel(threadId.toInt() + 100000) } } diff --git a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt index 98d74af7..a54793d9 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/NotificationManager.kt @@ -32,4 +32,6 @@ interface NotificationManager { fun getNotificationForBackup(): NotificationCompat.Builder + fun cancel(i: Int) + } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt index 2d962bc0..2e9247c0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt @@ -527,4 +527,8 @@ class NotificationManagerImpl @Inject constructor( .setOngoing(true) } + override fun cancel(i: Int) { + notificationManager.cancel(i) + } + } From 8705c32ee7b993a3be8292173a1ff037c8962735 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Tue, 10 Jun 2025 16:31:32 -0700 Subject: [PATCH 06/99] Allow blocking thread to complete before being disposed. If we call dispose after subscribe the process doesn't get to complete, leaving the notification, and eventually crashing the app. SupressLint is necessary to avoid warnings on not calling dispose. --- .../moez/QKSMS/receiver/BlockThreadReceiver.kt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt index ea2c2193..f3a6ddbb 100644 --- a/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt +++ b/data/src/main/java/com/moez/QKSMS/receiver/BlockThreadReceiver.kt @@ -18,6 +18,7 @@ */ package dev.octoshrimpy.quik.receiver +import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -27,6 +28,7 @@ import dev.octoshrimpy.quik.interactor.MarkBlocked import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences import io.reactivex.schedulers.Schedulers +import timber.log.Timber import javax.inject.Inject class BlockThreadReceiver : BroadcastReceiver() { @@ -36,6 +38,7 @@ class BlockThreadReceiver : BroadcastReceiver() { @Inject lateinit var markBlocked: MarkBlocked @Inject lateinit var prefs: Preferences + @SuppressLint("CheckResult") override fun onReceive(context: Context, intent: Intent) { AndroidInjection.inject(this, context) @@ -54,8 +57,14 @@ class BlockThreadReceiver : BroadcastReceiver() { MarkBlocked.Params(listOf(threadId), prefs.blockingManager.get(), null) ) ) - .subscribe { goAsync().finish() } - .dispose() + .subscribe( + { + goAsync().finish() + }, + { error -> + Timber.e("BlockThreadReceiver", "blocking failed") + goAsync().finish() + } + ) } - } From f3b178e182614ee6e002aef75df43f2e46b93c4a Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 13 Jun 2025 10:21:16 -0700 Subject: [PATCH 07/99] Remove all mentions of analytics The analytics build configuration has not been used or updated for a while. This removes some dependencies, and some deprecated code sections. --- .github/workflows/PR-deploy.yml | 6 +- .github/workflows/build-and-release.yml | 8 +- .github/workflows/build-on-pull.yml | 8 +- data/build.gradle | 7 - .../moez/QKSMS/manager/ReferralManagerImpl.kt | 10 + .../moez/QKSMS/mapper/RatingManagerImpl.kt | 4 - .../QKSMS/manager/AnalyticsManagerImpl.kt | 42 ---- .../moez/QKSMS/manager/ReferralManagerImpl.kt | 29 --- .../QKSMS/manager/AnalyticsManagerImpl.kt | 74 ------ .../moez/QKSMS/manager/ReferralManagerImpl.kt | 76 ------ .../com/moez/QKSMS/experiment/Experiment.kt | 4 +- .../moez/QKSMS/manager/AnalyticsManager.kt | 27 -- presentation/build.gradle | 26 +- .../java/com/moez/QKSMS/common/Navigator.kt | 7 - .../com/moez/QKSMS/common/QKApplication.kt | 6 +- .../QKSMS/common/util/BillingManagerImpl.kt | 21 ++ .../manager/BlockingManagerPresenter.kt | 9 - .../feature/main/DrawerBadgesExperiment.kt | 4 +- .../moez/QKSMS/feature/plus/PlusActivity.kt | 3 +- .../moez/QKSMS/feature/plus/PlusViewModel.kt | 3 - .../experiment/UpgradeButtonExperiment.kt | 4 +- .../feature/settings/SettingsPresenter.kt | 3 - .../com/moez/QKSMS/injection/AppModule.kt | 5 - .../QKSMS/common/util/BillingManagerImpl.kt | 39 --- .../moez/QKSMS/common/util/CrashlyticsTree.kt | 29 --- .../QKSMS/common/util/BillingManagerImpl.kt | 234 ------------------ .../moez/QKSMS/common/util/CrashlyticsTree.kt | 42 ---- 27 files changed, 49 insertions(+), 681 deletions(-) create mode 100644 data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt delete mode 100644 data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt delete mode 100644 data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt delete mode 100644 data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt delete mode 100644 data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt delete mode 100644 domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt delete mode 100644 presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt delete mode 100644 presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt delete mode 100644 presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt delete mode 100644 presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt diff --git a/.github/workflows/PR-deploy.yml b/.github/workflows/PR-deploy.yml index b3c4a4a4..47b62d23 100644 --- a/.github/workflows/PR-deploy.yml +++ b/.github/workflows/PR-deploy.yml @@ -30,7 +30,7 @@ jobs: - name: Build APK run: | - ./gradlew assembleNoAnalyticsRelease \ + ./gradlew assembleRelease \ -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ @@ -38,13 +38,13 @@ jobs: --stacktrace - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk - name: Upload APK uses: actions/upload-artifact@v4 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + path: presentation/build/outputs/apk/release/QUIK-release.apk release: name: validate fdroid APK diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 77093508..9ab8ba84 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -31,7 +31,7 @@ jobs: - name: Build APK run: | - ./gradlew assembleNoAnalyticsRelease \ + ./gradlew assembleRelease \ -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ @@ -39,13 +39,13 @@ jobs: --stacktrace - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/release/QUIK-v*-noAnalytics-release.apk presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk - name: Upload APK uses: actions/upload-artifact@v4 with: name: apk - path: presentation/build/outputs/apk/noAnalytics/release/QUIK-noAnalytics-release.apk + path: presentation/build/outputs/apk/release/QUIK-release.apk release: name: Release APK @@ -78,7 +78,7 @@ jobs: with: prerelease: true tag_name: "v${{ env.DATETIME }}" - files: QUIK-noAnalytics-release.apk + files: QUIK-release.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-on-pull.yml b/.github/workflows/build-on-pull.yml index ad252a1b..994b4fa8 100644 --- a/.github/workflows/build-on-pull.yml +++ b/.github/workflows/build-on-pull.yml @@ -25,20 +25,20 @@ jobs: - name: Build with Gradle run: | - ./gradlew assembleNoAnalyticsDebug \ + ./gradlew assembleDebug \ -Dandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore - name: Run Tests run: ./gradlew test - name: List APK Output Directory - run: ls -R presentation/build/outputs/apk/noAnalytics/debug + run: ls -R presentation/build/outputs/apk/debug - name: Rename APK - run: mv presentation/build/outputs/apk/noAnalytics/debug/QUIK-v*-noAnalytics-debug.apk presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk + run: mv presentation/build/outputs/apk/debug/QUIK-v*-debug.apk presentation/build/outputs/apk/debug/QUIK-debug.apk - name: Upload App uses: actions/upload-artifact@v4 with: name: apk-debug - path: presentation/build/outputs/apk/noAnalytics/debug/QUIK-noAnalytics-debug.apk + path: presentation/build/outputs/apk/debug/QUIK-debug.apk diff --git a/data/build.gradle b/data/build.gradle index c376e7f4..1ca9a517 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -23,7 +23,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 publishNonDefault true - flavorDimensions "analytics" compileOptions { sourceCompatibility 1.8 @@ -38,10 +37,6 @@ android { buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" } - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { dimension "analytics" } - } namespace 'dev.octoshrimpy.quik.data' } @@ -103,8 +98,6 @@ dependencies { implementation project(':common') implementation project(':domain') - withAnalyticsImplementation 'com.android.installreferrer:installreferrer:1.1' - withAnalyticsImplementation "com.amplitude:android-sdk:2.16.0" } repositories { diff --git a/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt new file mode 100644 index 00000000..741d059b --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt @@ -0,0 +1,10 @@ +package dev.octoshrimpy.quik.manager + +import javax.inject.Inject + +class ReferralManagerImpl @Inject constructor() : ReferralManager { + + override suspend fun trackReferrer() { + } + +} \ No newline at end of file diff --git a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt index 83a9cfaa..38891c1a 100644 --- a/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/mapper/RatingManagerImpl.kt @@ -19,14 +19,12 @@ package dev.octoshrimpy.quik.mapper import com.f2prateek.rx.preferences2.RxSharedPreferences -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.RatingManager import io.reactivex.rxkotlin.Observables import javax.inject.Inject class RatingManagerImpl @Inject constructor( rxPrefs: RxSharedPreferences, - private val analyticsManager: AnalyticsManager ) : RatingManager { companion object { @@ -50,12 +48,10 @@ class RatingManagerImpl @Inject constructor( } override fun rate() { -// analyticsManager.track("Clicked Rate") rated.set(true) } override fun dismiss() { -// analyticsManager.track("Clicked Rate (Dismiss)") dismissed.set(true) } diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt deleted file mode 100644 index 58dba725..00000000 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.manager - -import org.json.JSONObject -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class AnalyticsManagerImpl @Inject constructor() : AnalyticsManager { - - override fun track(event: String, vararg properties: Pair) { - - // Log the event, but don't do anything else - JSONObject(properties - .associateBy { pair -> pair.first } - .mapValues { pair -> pair.value.second }) - .also { Timber.v("$event: $it") } - } - - override fun setUserProperty(key: String, value: Any) { - Timber.v("$key: $value") - } - -} diff --git a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt deleted file mode 100644 index 2f81c87a..00000000 --- a/data/src/noAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.manager - -import javax.inject.Inject - -class ReferralManagerImpl @Inject constructor() : ReferralManager { - - override suspend fun trackReferrer() { - } - -} diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt deleted file mode 100644 index aa548786..00000000 --- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/AnalyticsManagerImpl.kt +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.manager - -import android.content.Context -import com.amplitude.api.Amplitude -import com.amplitude.api.AmplitudeClient -import com.amplitude.api.Identify -import dev.octoshrimpy.quik.data.BuildConfig -import org.json.JSONArray -import org.json.JSONObject -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsManager { - - private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY) - - init { - amplitude.trackSessionEvents(true) - } - - override fun track(event: String, vararg properties: Pair) { - val propertiesJson = JSONObject(properties - .associateBy { pair -> pair.first } - .mapValues { pair -> pair.value.second }) - .also { Timber.v("$event: $it") } - - amplitude.logEvent(event, propertiesJson) - } - - override fun setUserProperty(key: String, value: Any) { - Timber.v("$key: $value") - - // Set the value in Amplitude - val identify = Identify() - when (value) { - is Boolean -> identify.set(key, value) - is BooleanArray -> identify.set(key, value) - is Double -> identify.set(key, value) - is DoubleArray -> identify.set(key, value) - is Float -> identify.set(key, value) - is FloatArray -> identify.set(key, value) - is Int -> identify.set(key, value) - is IntArray -> identify.set(key, value) - is Long -> identify.set(key, value) - is LongArray -> identify.set(key, value) - is String -> identify.set(key, value) - is JSONArray -> identify.set(key, value) - is JSONObject -> identify.set(key, value) - else -> Timber.e("Value of type ${value::class.java} not supported") - } - amplitude.identify(identify) - } - -} diff --git a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt b/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt deleted file mode 100644 index f59df235..00000000 --- a/data/src/withAnalytics/java/com/moez/QKSMS/manager/ReferralManagerImpl.kt +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.manager - -import android.content.Context -import com.android.installreferrer.api.InstallReferrerClient -import com.android.installreferrer.api.InstallReferrerStateListener -import dev.octoshrimpy.quik.util.Preferences -import kotlinx.coroutines.suspendCancellableCoroutine -import javax.inject.Inject -import kotlin.coroutines.resume - -class ReferralManagerImpl @Inject constructor( - private val analytics: AnalyticsManager, - private val context: Context, - private val prefs: Preferences -) : ReferralManager { - - override suspend fun trackReferrer() { - if (prefs.didSetReferrer.get()) { - return - } - - context.packageManager.getInstallerPackageName(context.packageName)?.let { installer -> - analytics.setUserProperty("Installer", installer) - } - - val referrerClient = InstallReferrerClient.newBuilder(context).build() - val responseCode = suspendCancellableCoroutine { cont -> - referrerClient.startConnection(object : InstallReferrerStateListener { - override fun onInstallReferrerSetupFinished(responseCode: Int) { - cont.resume(responseCode) - } - - override fun onInstallReferrerServiceDisconnected() { - cont.resume(InstallReferrerClient.InstallReferrerResponse.SERVICE_DISCONNECTED) - } - }) - - cont.invokeOnCancellation { - referrerClient.endConnection() - } - } - - when (responseCode) { - InstallReferrerClient.InstallReferrerResponse.OK -> { - analytics.setUserProperty("Referrer", referrerClient.installReferrer.installReferrer) - prefs.didSetReferrer.set(true) - } - - InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED -> { - prefs.didSetReferrer.set(true) - } - } - - referrerClient.endConnection() - } - -} diff --git a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt index f99e095a..d1f3cc3c 100644 --- a/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt +++ b/domain/src/main/java/com/moez/QKSMS/experiment/Experiment.kt @@ -20,11 +20,10 @@ package dev.octoshrimpy.quik.experiment import android.content.Context import android.preference.PreferenceManager -import dev.octoshrimpy.quik.manager.AnalyticsManager import java.util.Locale import java.util.Random -abstract class Experiment(val context: Context, val analytics: AnalyticsManager) { +abstract class Experiment(val context: Context) { private val prefs by lazy { PreferenceManager.getDefaultSharedPreferences(context) } private val prefKey: String @@ -49,7 +48,6 @@ abstract class Experiment(val context: Context, val analytics: AnalyticsManag else -> { // Variant hasn't been set yet variants[Random().nextInt(variants.size)].also { variant -> - analytics.setUserProperty("Experiment: $key", variant.key) prefs.edit().putString(prefKey, variant.key).apply() }.value } diff --git a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt deleted file mode 100644 index 7c8109a8..00000000 --- a/domain/src/main/java/com/moez/QKSMS/manager/AnalyticsManager.kt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.manager - -interface AnalyticsManager { - - fun track(event: String, vararg properties: Pair) - - fun setUserProperty(key: String, value: Any) - -} \ No newline at end of file diff --git a/presentation/build.gradle b/presentation/build.gradle index 454ef398..280c4c7e 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -24,7 +24,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 - flavorDimensions "analytics" defaultConfig { applicationId 'dev.octoshrimpy.quik' @@ -86,12 +85,6 @@ android { jvmTarget = "1.8" } - productFlavors { - withAnalytics { dimension "analytics" } - noAnalytics { - } - } - lint { abortOnError false } @@ -108,10 +101,8 @@ androidExtensions { } configurations { - noAnalyticsDebug - noAnalyticsRelease - withAnalyticsDebug - withAnalyticsRelease + debug + release } dependencies { @@ -218,20 +209,7 @@ dependencies { implementation project(':data') implementation project(':domain') - withAnalyticsImplementation 'com.google.firebase:firebase-crashlytics:17.3.0' - withAnalyticsImplementation "com.android.billingclient:billing:$billing_version" - withAnalyticsImplementation "com.android.billingclient:billing-ktx:$billing_version" - noAnalyticsDebug project(path: ':data', configuration: 'noAnalyticsDebug') - noAnalyticsRelease project(path: ':data', configuration: 'noAnalyticsRelease') - withAnalyticsDebug project(path: ':data', configuration: 'withAnalyticsDebug') - withAnalyticsRelease project(path: ':data', configuration: 'withAnalyticsRelease') } - -if (getGradle().getStartParameter().getTaskRequests().toString().contains("WithAnalytics")) { - apply plugin: 'com.google.gms.google-services' - apply plugin: 'com.google.firebase.crashlytics' -} - // Check to make sure that the keystore file is present when building a release gradle.taskGraph.whenReady { taskGraph -> if ((taskGraph.hasTask(':assembleRelease') || diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 77a8ff33..775c2810 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -40,7 +40,6 @@ import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity import dev.octoshrimpy.quik.feature.plus.PlusActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity import dev.octoshrimpy.quik.feature.settings.SettingsActivity -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.PermissionManager @@ -51,7 +50,6 @@ import javax.inject.Singleton @Singleton class Navigator @Inject constructor( private val context: Context, - private val analyticsManager: AnalyticsManager, private val billingManager: BillingManager, private val notificationManager: NotificationManager, private val permissions: PermissionManager @@ -75,7 +73,6 @@ class Navigator @Inject constructor( * one of [main_menu, compose_schedule, settings_night, settings_theme] */ fun showQksmsPlusActivity(source: String) { -// analyticsManager.track("Viewed QKSMS+", Pair("source", source)) val intent = Intent(context, PlusActivity::class.java) startActivity(intent) } @@ -160,12 +157,10 @@ class Navigator @Inject constructor( } fun showBackup() { -// analyticsManager.track("Viewed Backup") startActivity(Intent(context, BackupActivity::class.java)) } fun showScheduled() { -// analyticsManager.track("Viewed Scheduled") val intent = Intent(context, ScheduledActivity::class.java) startActivity(intent) } @@ -264,14 +259,12 @@ class Navigator @Inject constructor( .append("Device: ${Build.BRAND} ${Build.MODEL}\n") .append("SDK: ${Build.VERSION.SDK_INT}\n") .append("Upgraded" - .takeIf { BuildConfig.FLAVOR != "noAnalytics" } .takeIf { billingManager.upgradeStatus.blockingFirst() } ?: "") .toString()) startActivityExternal(intent) } fun showInvite() { -// analyticsManager.track("Clicked Invite") Intent(Intent.ACTION_SEND) .setType("text/plain") .putExtra(Intent.EXTRA_TEXT, "https://github.com/octoshrimpy/quik/releases/latest") diff --git a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt index d2a41b94..c43bc67f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/QKApplication.kt @@ -36,12 +36,10 @@ import dagger.android.HasActivityInjector import dagger.android.HasBroadcastReceiverInjector import dagger.android.HasServiceInjector import dev.octoshrimpy.quik.R -import dev.octoshrimpy.quik.common.util.CrashlyticsTree import dev.octoshrimpy.quik.common.util.FileLoggingTree import dev.octoshrimpy.quik.injection.AppComponentManager import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.interactor.SpeakThreads -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ReferralManager import dev.octoshrimpy.quik.migration.QkMigration @@ -62,8 +60,6 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn * Inject these so that they are forced to initialize */ @Suppress("unused") - @Inject lateinit var analyticsManager: AnalyticsManager - @Suppress("unused") @Inject lateinit var qkMigration: QkMigration @Inject lateinit var billingManager: BillingManager @@ -106,7 +102,7 @@ class QKApplication : Application(), HasActivityInjector, HasBroadcastReceiverIn nightModeManager.updateCurrentTheme() // configure timber logging - Timber.plant(Timber.DebugTree(), CrashlyticsTree(), fileLoggingTree) + Timber.plant(Timber.DebugTree(), fileLoggingTree) // configure emoji compatibility with bundled package // (bundled library works with no play-services/gsm os versions) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt new file mode 100644 index 00000000..8d671337 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt @@ -0,0 +1,21 @@ +package dev.octoshrimpy.quik.common.util + +import android.app.Activity +import dev.octoshrimpy.quik.manager.BillingManager +import io.reactivex.Observable +import io.reactivex.subjects.BehaviorSubject +import javax.inject.Inject +import javax.inject.Singleton + +@Singleton +class BillingManagerImpl @Inject constructor( +): BillingManager { + + override val products: Observable> = BehaviorSubject.createDefault(listOf()) + override val upgradeStatus: Observable = BehaviorSubject.createDefault(true) + + override suspend fun checkForPurchases() = Unit + override suspend fun queryProducts() = Unit + override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit + +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt index f5d5a815..2241e08d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPresenter.kt @@ -11,7 +11,6 @@ import dev.octoshrimpy.quik.blocking.QksmsBlockingClient import dev.octoshrimpy.quik.blocking.ShouldIAnswerBlockingClient import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkPresenter -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.util.Preferences import io.reactivex.Observable @@ -21,7 +20,6 @@ import io.reactivex.schedulers.Schedulers import javax.inject.Inject class BlockingManagerPresenter @Inject constructor( - private val analytics: AnalyticsManager, private val callBlocker: CallBlockerBlockingClient, private val callControl: CallControlBlockingClient, private val context: Context, @@ -69,7 +67,6 @@ class BlockingManagerPresenter @Inject constructor( .switchMap { numbers -> qksms.block(numbers).andThen(Observable.just(Unit)) } // Hack .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "QKSMS") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_QKSMS) } @@ -77,7 +74,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = callBlocker.isAvailable() if (!installed) { - analytics.track("Install Call Blocker") navigator.installCallBlocker() } @@ -86,7 +82,6 @@ class BlockingManagerPresenter @Inject constructor( } .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "Call Blocker") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CB) } @@ -94,7 +89,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = callControl.isAvailable() if (!installed) { - analytics.track("Install Call Control") navigator.installCallControl() } @@ -119,7 +113,6 @@ class BlockingManagerPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { callControl.shouldBlock("callcontrol").blockingGet() - analytics.setUserProperty("Blocking Manager", "Call Control") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_CC) } @@ -127,7 +120,6 @@ class BlockingManagerPresenter @Inject constructor( .filter { val installed = shouldIAnswer.isAvailable() if (!installed) { - analytics.track("Install SIA") navigator.installSia() } @@ -136,7 +128,6 @@ class BlockingManagerPresenter @Inject constructor( } .autoDisposable(view.scope()) .subscribe { - analytics.setUserProperty("Blocking Manager", "SIA") prefs.blockingManager.set(Preferences.BLOCKING_MANAGER_SIA) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt index fd4c3567..7288d9fc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/DrawerBadgesExperiment.kt @@ -21,13 +21,11 @@ package dev.octoshrimpy.quik.feature.main import android.content.Context import dev.octoshrimpy.quik.experiment.Experiment import dev.octoshrimpy.quik.experiment.Variant -import dev.octoshrimpy.quik.manager.AnalyticsManager import javax.inject.Inject class DrawerBadgesExperiment @Inject constructor( context: Context, - analyticsManager: AnalyticsManager -) : Experiment(context, analyticsManager) { +) : Experiment(context) { override val key: String = "Drawer Badges" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index a2277f86..222f1b3d 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -25,7 +25,6 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders import com.jakewharton.rxbinding2.view.clicks import dagger.android.AndroidInjection -import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity import dev.octoshrimpy.quik.common.util.FontProvider @@ -102,7 +101,7 @@ class PlusActivity : QkThemedActivity(), PlusView { upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) - val fdroid = BuildConfig.FLAVOR == "noAnalytics" + val fdroid = true free.setVisible(fdroid) toUpgrade.setVisible(!fdroid && !state.upgraded) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index 53e9c68f..ced17068 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -22,14 +22,12 @@ import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkViewModel -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import javax.inject.Inject class PlusViewModel @Inject constructor( - private val analyticsManager: AnalyticsManager, private val billingManager: BillingManager, private val navigator: Navigator ) : QkViewModel(PlusState()) { @@ -55,7 +53,6 @@ class PlusViewModel @Inject constructor( Observable.merge( view.upgradeIntent.map { BillingManager.SKU_PLUS }, view.upgradeDonateIntent.map { BillingManager.SKU_PLUS_DONATE }) -// .doOnNext { sku -> analyticsManager.track("Clicked Upgrade", Pair("sku", sku)) } .autoDisposable(view.scope()) .subscribe { sku -> view.initiatePurchaseFlow(billingManager, sku) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index 1d38c371..eee7cc1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt @@ -22,13 +22,11 @@ import android.content.Context import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.experiment.Experiment import dev.octoshrimpy.quik.experiment.Variant -import dev.octoshrimpy.quik.manager.AnalyticsManager import javax.inject.Inject class UpgradeButtonExperiment @Inject constructor( context: Context, - analytics: AnalyticsManager -) : Experiment(context, analytics) { +) : Experiment(context) { override val key: String = "Upgrade Button" diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index 154dd666..0ce4ae60 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -29,7 +29,6 @@ import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.makeToast import dev.octoshrimpy.quik.interactor.DeleteOldMessages import dev.octoshrimpy.quik.interactor.SyncMessages -import dev.octoshrimpy.quik.manager.AnalyticsManager import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository @@ -47,7 +46,6 @@ import javax.inject.Inject class SettingsPresenter @Inject constructor( colors: Colors, syncRepo: SyncRepository, - private val analytics: AnalyticsManager, private val context: Context, private val billingManager: BillingManager, private val dateFormatter: DateFormatter, @@ -205,7 +203,6 @@ class SettingsPresenter @Inject constructor( R.id.textSize -> view.showTextSizePicker() R.id.autoColor -> { - analytics.setUserProperty("Preference: Auto Color", !prefs.autoColor.get()) prefs.autoColor.set(!prefs.autoColor.get()) } diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index d34cd3a2..84cc8b71 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -44,8 +44,6 @@ import dev.octoshrimpy.quik.manager.ActiveConversationManager import dev.octoshrimpy.quik.manager.ActiveConversationManagerImpl import dev.octoshrimpy.quik.manager.AlarmManager import dev.octoshrimpy.quik.manager.AlarmManagerImpl -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.AnalyticsManagerImpl import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.manager.ChangelogManagerImpl @@ -143,9 +141,6 @@ class AppModule(private var application: Application) { @Provides fun provideAlarmManager(manager: AlarmManagerImpl): AlarmManager = manager - @Provides - fun provideAnalyticsManager(manager: AnalyticsManagerImpl): AnalyticsManager = manager - @Provides fun blockingClient(manager: BlockingManager): BlockingClient = manager diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt deleted file mode 100644 index d3f7d68f..00000000 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.util - -import android.app.Activity -import dev.octoshrimpy.quik.manager.BillingManager -import io.reactivex.Observable -import io.reactivex.subjects.BehaviorSubject -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class BillingManagerImpl @Inject constructor( -): BillingManager { - - override val products: Observable> = BehaviorSubject.createDefault(listOf()) - override val upgradeStatus: Observable = BehaviorSubject.createDefault(true) - - override suspend fun checkForPurchases() = Unit - override suspend fun queryProducts() = Unit - override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = Unit - -} diff --git a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt deleted file mode 100644 index da897ad9..00000000 --- a/presentation/src/noAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.util - -import timber.log.Timber - -class CrashlyticsTree : Timber.Tree() { - - override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { - // Do nothing for noAnalytics build flavor - } - -} diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt deleted file mode 100644 index 35512d53..00000000 --- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/BillingManagerImpl.kt +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (C) 2020 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ - -package dev.octoshrimpy.quik.common.util - -import android.app.Activity -import android.content.Context -import com.android.billingclient.api.AcknowledgePurchaseParams -import com.android.billingclient.api.BillingClient -import com.android.billingclient.api.BillingClientStateListener -import com.android.billingclient.api.BillingFlowParams -import com.android.billingclient.api.BillingResult -import com.android.billingclient.api.ProductDetails -import com.android.billingclient.api.Purchase -import com.android.billingclient.api.Purchase.PurchaseState -import com.android.billingclient.api.PurchasesUpdatedListener -import com.android.billingclient.api.QueryProductDetailsParams -import com.android.billingclient.api.QueryPurchaseHistoryParams -import com.android.billingclient.api.QueryPurchasesParams -import com.android.billingclient.api.acknowledgePurchase -import com.android.billingclient.api.queryProductDetails -import com.android.billingclient.api.queryPurchaseHistory -import com.android.billingclient.api.queryPurchasesAsync -import dev.octoshrimpy.quik.manager.AnalyticsManager -import dev.octoshrimpy.quik.manager.BillingManager -import io.reactivex.Observable -import io.reactivex.subjects.BehaviorSubject -import io.reactivex.subjects.Subject -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.channels.BufferOverflow -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.first -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext -import timber.log.Timber -import javax.inject.Inject -import javax.inject.Singleton - -@Singleton -class BillingManagerImpl @Inject constructor( - context: Context, - private val analyticsManager: AnalyticsManager -) : BillingManager, BillingClientStateListener, PurchasesUpdatedListener { - - private val productsSubject: Subject> = BehaviorSubject.create() - override val products: Observable> = productsSubject - .map { productDetailsList -> - productDetailsList.map { productDetails -> - BillingManager.Product( - sku = productDetails.productId, - price = productDetails.oneTimePurchaseOfferDetails!!.formattedPrice, - priceCurrencyCode = productDetails.oneTimePurchaseOfferDetails!!.priceCurrencyCode - ) - } - } - - private val purchaseListSubject = BehaviorSubject.create>() - override val upgradeStatus: Observable = purchaseListSubject - .map { purchases -> - purchases - .filter { it.purchaseState == Purchase.PurchaseState.PURCHASED } - .flatMap { it.products } - .any { it in skus } - } - .distinctUntilChanged() - .doOnNext { upgraded -> analyticsManager.setUserProperty("Upgraded", upgraded) } - - private val skus = listOf(BillingManager.SKU_PLUS, BillingManager.SKU_PLUS_DONATE) - private val billingClient: BillingClient = BillingClient.newBuilder(context) - .setListener(this) - .enablePendingPurchases() - .build() - - private val billingClientState = MutableSharedFlow( - replay = 1, - onBufferOverflow = BufferOverflow.DROP_OLDEST - ) - - init { - billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED) - } - - override suspend fun checkForPurchases() = executeServiceRequest { - // Query from the local cache first - queryPurchases() - - // Update the cache, then read from it again - queryPurchaseHistory() - queryPurchases() - } - - override suspend fun queryProducts() = executeServiceRequest { - val productList = skus.map { sku -> - QueryProductDetailsParams.Product.newBuilder() - .setProductId(sku) - .setProductType(BillingClient.ProductType.INAPP) - .build() - } - val params = QueryProductDetailsParams.newBuilder() - .setProductList(productList) - - val result = billingClient.queryProductDetails(params.build()) - if (result.billingResult.responseCode == BillingClient.BillingResponseCode.OK) { - productsSubject.onNext(result.productDetailsList.orEmpty()) - } else { - Timber.w("Error querying products", result.billingResult) - } - } - - override suspend fun initiatePurchaseFlow(activity: Activity, sku: String) = executeServiceRequest { - val queryProductDetailsParams = QueryProductDetailsParams.newBuilder() - .setProductList(listOf( - QueryProductDetailsParams.Product.newBuilder() - .setProductId(sku) - .setProductType(BillingClient.ProductType.INAPP) - .build() - )) - .build() - - val productDetailsResult = withContext(Dispatchers.IO) { - billingClient.queryProductDetails(queryProductDetailsParams) - } - - if (productDetailsResult.billingResult.responseCode != BillingClient.BillingResponseCode.OK) { - Timber.w("Error querying product details", productDetailsResult.billingResult) - return@executeServiceRequest - } - - val productDetailsParams = BillingFlowParams.ProductDetailsParams.newBuilder() - .setProductDetails(productDetailsResult.productDetailsList!!.first()) - .build() - - val billingFlowParams = BillingFlowParams.newBuilder() - .setProductDetailsParamsList(listOf(productDetailsParams)) - .build() - - billingClient.launchBillingFlow(activity, billingFlowParams) - } - - override fun onPurchasesUpdated(result: BillingResult, purchases: List?) { - if (result.responseCode == BillingClient.BillingResponseCode.OK) { - GlobalScope.launch(Dispatchers.IO) { - handlePurchases(purchases.orEmpty()) - } - } else { - Timber.w("Error purchasing", result) - } - } - - /** - * Queries the local purchases saved in Google Play's cache - */ - private suspend fun queryPurchases() { - val params = QueryPurchasesParams.newBuilder() - .setProductType(BillingClient.ProductType.INAPP) - .build() - - val result = billingClient.queryPurchasesAsync(params) - if (result.billingResult.responseCode == BillingClient.BillingResponseCode.OK) { - handlePurchases(result.purchasesList) - } else { - Timber.w("Error checking for purchases", result.billingResult) - } - } - - /** - * Fetches the list of purchases and updates the local cache - */ - private suspend fun queryPurchaseHistory() { - val params = QueryPurchaseHistoryParams.newBuilder() - .setProductType(BillingClient.ProductType.INAPP) - .build() - - val result = billingClient.queryPurchaseHistory(params) - if (result.billingResult.responseCode != BillingClient.BillingResponseCode.OK) { - Timber.w("Error querying purchase history", result.billingResult) - return - } - } - - private suspend fun handlePurchases(purchases: List) = executeServiceRequest { - purchases.forEach { purchase -> - if (!purchase.isAcknowledged && purchase.purchaseState == PurchaseState.PURCHASED) { - val params = AcknowledgePurchaseParams.newBuilder() - .setPurchaseToken(purchase.purchaseToken) - .build() - - Timber.i("Acknowledging purchase ${purchase.orderId}") - val result = billingClient.acknowledgePurchase(params) - Timber.i("Acknowledgement result: ${result.responseCode}, ${result.debugMessage}") - } - } - - purchaseListSubject.onNext(purchases) - } - - private suspend fun executeServiceRequest(runnable: suspend () -> Unit) { - if (billingClientState.first() != BillingClient.BillingResponseCode.OK) { - Timber.i("Starting billing service") - billingClient.startConnection(this) - } - - billingClientState.first { state -> state == BillingClient.BillingResponseCode.OK } - runnable() - } - - override fun onBillingSetupFinished(result: BillingResult) { - Timber.i("Billing response: ${result.responseCode}") - billingClientState.tryEmit(result.responseCode) - } - - override fun onBillingServiceDisconnected() { - Timber.i("Billing service disconnected") - billingClientState.tryEmit(BillingClient.BillingResponseCode.SERVICE_DISCONNECTED) - } - -} diff --git a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt b/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt deleted file mode 100644 index b87e93f5..00000000 --- a/presentation/src/withAnalytics/java/com/moez/QKSMS/common/util/CrashlyticsTree.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2017 Moez Bhatti - * - * This file is part of QKSMS. - * - * QKSMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * QKSMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with QKSMS. If not, see . - */ -package dev.octoshrimpy.quik.common.util - -import android.util.Log -import com.google.firebase.crashlytics.FirebaseCrashlytics -import timber.log.Timber - -class CrashlyticsTree : Timber.Tree() { - - override fun log(priority: Int, tag: String?, message: String?, throwable: Throwable?) { - val crashlytics = FirebaseCrashlytics.getInstance() - val priorityString = when (priority) { - Log.VERBOSE -> "V" - Log.DEBUG -> "D" - Log.INFO -> "I" - Log.WARN -> "W" - Log.ERROR -> "E" - else -> "WTF" - } - - crashlytics.log("$priorityString/$tag: $message") - throwable?.run(crashlytics::recordException) - } - -} From 700e6dbf5ef85d22b391f9047e25eb35bec5e205 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 13 Jun 2025 12:29:21 -0700 Subject: [PATCH 08/99] Add weblate information to README --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 2fba3223..515956d0 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,9 @@ # QUIK [![Build and Release](https://github.com/octoshrimpy/quik/actions/workflows/build-and-release.yml/badge.svg)](https://github.com/octoshrimpy/quik/actions/workflows/build-and-release.yml) + +Translation status + QUIK is an open source replacement to the [stock messaging app](https://github.com/android/platform_packages_apps_mms) on Android. It is a continuation of [QKSMS](https://github.com/moezbhatti/qksms). @@ -46,6 +49,13 @@ When reporting a bug, please make sure to provide the following information: ## Contributing Contributions welcome! Please see the [contributing guidelines](/CONTRIBUTING.md) for details. +## Translations +If you'd like to add translations to QUIK, please join the project on [Weblate](https://hosted.weblate.org/engage/quik/)! Translations that are committed directly to source files will not be accepted. For more information see the [translation guidelines](/CONTRIBUTING.md#translate). + + +Translation status + + ## Thank you A special thank you to Jake ([@klinker41](https://github.com/klinker41)) and Luke Klinker ([@klinker24](https://github.com/klinker24)) for their work on [android-smsmms](https://github.com/klinker41/android-smsmms), which has been an unspeakably large help in implementing MMS into QUIK. From 5ce33c2a7f42b49cdcc1baeee1e10963d2fc207a Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 13 Jun 2025 12:43:09 -0700 Subject: [PATCH 09/99] Add weblate information to the contributing guidelines. --- CONTRIBUTING.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d9cfc78e..0859dde3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,12 +16,13 @@ When reporting a bug, please make sure to provide the following information: To do this, navigate to the release tab in this repository and click on releases. There are two types of releases in Quik. The first is the `Latest Release`. This is the version that is distributed over the app stores. The other type is `Pre-Release`, which contains the latest features and may have bugs. To install this, download the apk from the release tab and install it on your phone. (Instructions can be found in the wiki for a more detailed explanation). Once you have done this, simply use the app as normal, and report any bugs you come across. ## Translate -To translate this app navigate to `presentation/src/main/res` and find or make a values file with the language you wish to edit. Then copy over the `strings.xml` file from `presentation/src/main/res/values` and translate it. Please do not translate any string with the `translatable=false` attribute. Also, remember to make sure to insert a backslash `\` before any apostrophe `'` or quotes `"`. - +We recommend checking out the [Weblate documentation](https://docs.weblate.org/en/latest/index.html), and if you need any help please open an issue. ## Update the Wiki To update the wiki, simply navigate to the [wiki tab](https://github.com/octoshrimpy/quik/wiki) in this repository, find the file that you need to edit, and then click `Edit Page`. Then you can edit and commit your change. For more sizeable changes, and for feedback and questions please comment in [this discussion](https://github.com/octoshrimpy/quik/discussions/174). ## Fix Bugs From 2cc4925a111634f3f9d7e495960eb825ce59eff2 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Tue, 17 Jun 2025 10:46:36 -0700 Subject: [PATCH 10/99] Remove unused strings. These strings were replaced and are outdated. --- presentation/src/main/res/values-ar/strings.xml | 2 -- presentation/src/main/res/values-bn/strings.xml | 2 -- presentation/src/main/res/values-cs/strings.xml | 2 -- presentation/src/main/res/values-da/strings.xml | 2 -- presentation/src/main/res/values-de/strings.xml | 2 -- presentation/src/main/res/values-el/strings.xml | 2 -- presentation/src/main/res/values-es/strings.xml | 2 -- presentation/src/main/res/values-fa/strings.xml | 2 -- presentation/src/main/res/values-fi/strings.xml | 2 -- presentation/src/main/res/values-fr/strings.xml | 1 - presentation/src/main/res/values-gd/strings.xml | 2 -- presentation/src/main/res/values-hi/strings.xml | 2 -- presentation/src/main/res/values-hr/strings.xml | 2 -- presentation/src/main/res/values-hu/strings.xml | 4 +--- presentation/src/main/res/values-in/strings.xml | 2 -- presentation/src/main/res/values-it/strings.xml | 2 -- presentation/src/main/res/values-iw/strings.xml | 2 -- presentation/src/main/res/values-ja/strings.xml | 2 -- presentation/src/main/res/values-ko/strings.xml | 2 -- presentation/src/main/res/values-lt/strings.xml | 2 -- presentation/src/main/res/values-nb/strings.xml | 2 -- presentation/src/main/res/values-ne/strings.xml | 2 -- presentation/src/main/res/values-nl/strings.xml | 2 -- presentation/src/main/res/values-pl/strings.xml | 1 - presentation/src/main/res/values-pt-rBR/strings.xml | 2 -- presentation/src/main/res/values-pt/strings.xml | 2 -- presentation/src/main/res/values-ro/strings.xml | 1 - presentation/src/main/res/values-ru/strings.xml | 2 -- presentation/src/main/res/values-sk/strings.xml | 2 -- presentation/src/main/res/values-sl/strings.xml | 2 -- presentation/src/main/res/values-sr/strings.xml | 2 -- presentation/src/main/res/values-sv/strings.xml | 2 -- presentation/src/main/res/values-ta/strings.xml | 2 -- presentation/src/main/res/values-th/strings.xml | 2 -- presentation/src/main/res/values-tl/strings.xml | 2 -- presentation/src/main/res/values-tr/strings.xml | 2 -- presentation/src/main/res/values-uk/strings.xml | 2 -- presentation/src/main/res/values-ur/strings.xml | 2 -- presentation/src/main/res/values-vi/strings.xml | 2 -- presentation/src/main/res/values-zh-rCN/strings.xml | 2 -- presentation/src/main/res/values-zh-rHK/strings.xml | 2 -- presentation/src/main/res/values-zh-rTW/strings.xml | 2 -- 42 files changed, 1 insertion(+), 82 deletions(-) diff --git a/presentation/src/main/res/values-ar/strings.xml b/presentation/src/main/res/values-ar/strings.xml index 3e636809..f6a09311 100644 --- a/presentation/src/main/res/values-ar/strings.xml +++ b/presentation/src/main/res/values-ar/strings.xml @@ -48,7 +48,6 @@ حظر مزامنة الرسائل… أنت: %s - مسودة النتائج في الرسائل %d رسائل ستظهر المحادثات الخاصة بك هنا @@ -374,7 +373,6 @@ تعيين تراجع تم النسخ - تم حفظ المحادثة استخدام هذه الميزة يتطلب فتح QUIK+ لا رسائل جديدة diff --git a/presentation/src/main/res/values-bn/strings.xml b/presentation/src/main/res/values-bn/strings.xml index 8367d042..7d739c3b 100644 --- a/presentation/src/main/res/values-bn/strings.xml +++ b/presentation/src/main/res/values-bn/strings.xml @@ -48,7 +48,6 @@ অবরুদ্ধ বার্তাগুলি সিঙ্ক হচ্ছে… তুমি: %s - খসড়া বার্তার ভিতর পাওয়া গেছে %dটি বার্তা তোমার আলাপ এখানে দেখা যাবে @@ -357,7 +356,6 @@ সেট করুন বাতিল করো অনুলিপি করা হয়েছে - আর্কাইভ করা আলাপ এই ব্যবহার করতে আপনাকে অবশ্যই QUIK + আনলক করতে হবে নতুন বার্তা diff --git a/presentation/src/main/res/values-cs/strings.xml b/presentation/src/main/res/values-cs/strings.xml index 12f17a43..4b69f30b 100644 --- a/presentation/src/main/res/values-cs/strings.xml +++ b/presentation/src/main/res/values-cs/strings.xml @@ -48,7 +48,6 @@ Blokovat Synchronizace zpráv… Vy: %s - Koncept Výsledky ve zprávách %d zpráv Zde se objeví vaše konverzace @@ -365,7 +364,6 @@ Nastavit Zpět Zkopírováno - Archivované konverzace Pro použití musíte odemknout verzi QUIK + Nová zpráva diff --git a/presentation/src/main/res/values-da/strings.xml b/presentation/src/main/res/values-da/strings.xml index 5a87553f..f0b8190e 100644 --- a/presentation/src/main/res/values-da/strings.xml +++ b/presentation/src/main/res/values-da/strings.xml @@ -48,7 +48,6 @@ Blokér Synkroniserer beskeder… Dig: %s - Udkast Resultater i beskeder %d beskeder Dine samtaler vil fremgå her @@ -357,7 +356,6 @@ Indstil Fortryd Kopieret - Arkiveret samtale Dette kræver oplåsning af QUIK+ Ny besked diff --git a/presentation/src/main/res/values-de/strings.xml b/presentation/src/main/res/values-de/strings.xml index 18d9819a..3cf4599b 100644 --- a/presentation/src/main/res/values-de/strings.xml +++ b/presentation/src/main/res/values-de/strings.xml @@ -48,7 +48,6 @@ Blockieren Synchronisiere Nachrichten… Du: %s - Entwurf Ergebnisse in Nachrichten %d Nachrichten Deine Unterhaltungen werden hier angezeigt @@ -357,7 +356,6 @@ OK Rückgängig Kopiert - Archivierte Unterhaltung Für diese Funktion muss QUIK+ freigeschalten werden Neue Nachricht diff --git a/presentation/src/main/res/values-el/strings.xml b/presentation/src/main/res/values-el/strings.xml index 5fcc2488..6d98459a 100644 --- a/presentation/src/main/res/values-el/strings.xml +++ b/presentation/src/main/res/values-el/strings.xml @@ -48,7 +48,6 @@ Φραγή Συγχρονισμός μηνυμάτων… Εσείς: %s - Πρόχειρο Αποτελέσματα στα μηνύματα Μηνύματα: %d Οι συζητήσεις σας θα εμφανίζονται εδώ @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-es/strings.xml b/presentation/src/main/res/values-es/strings.xml index b7a870eb..186c59bb 100644 --- a/presentation/src/main/res/values-es/strings.xml +++ b/presentation/src/main/res/values-es/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronización de mensajes... Tú: %s - Borrador Resultados en los mensajes %d mensajes Sus conversaciones aparecerán aquí @@ -357,7 +356,6 @@ Establecer Deshacer Copiado - Conversación archivada Debe desbloquear QUIK+ para utilizarlo Nuevo mensaje diff --git a/presentation/src/main/res/values-fa/strings.xml b/presentation/src/main/res/values-fa/strings.xml index f197bdb2..edd9cd33 100644 --- a/presentation/src/main/res/values-fa/strings.xml +++ b/presentation/src/main/res/values-fa/strings.xml @@ -48,7 +48,6 @@ مسدود کردن در حال همگام‌سازی پیام‌ها… شما: %s - پیش‌نویس نتایج در پیام‌ها %d پیام گفتگوهایتان اینجا نمایش داده می‌شود @@ -357,7 +356,6 @@ تنظیم برگرده کپی شد - گفتگوی بایگانی شده باید نسخه پیشرفته را فعال کنید پیام جدید diff --git a/presentation/src/main/res/values-fi/strings.xml b/presentation/src/main/res/values-fi/strings.xml index af3ade75..fdae78c5 100644 --- a/presentation/src/main/res/values-fi/strings.xml +++ b/presentation/src/main/res/values-fi/strings.xml @@ -48,7 +48,6 @@ Estä Synkronoidaan viestejä… Sinä: %s - Luonnos: %s Tuloksia viesteissä %d viestiä Keskustelusi näkyvät tässä @@ -357,7 +356,6 @@ Aseta Kumoa Kopioitu - Arkistoidut keskustelut Sinun pitää avata QUIK+ käyttääksesi tätä Uusi viesti diff --git a/presentation/src/main/res/values-fr/strings.xml b/presentation/src/main/res/values-fr/strings.xml index ccdc2aca..d34e643a 100644 --- a/presentation/src/main/res/values-fr/strings.xml +++ b/presentation/src/main/res/values-fr/strings.xml @@ -62,7 +62,6 @@ Renommer la conversation Synchronisation des messages… Vous : %s - Brouillons Résultats dans les messages %d messages Vos conversations apparaîtront ici diff --git a/presentation/src/main/res/values-gd/strings.xml b/presentation/src/main/res/values-gd/strings.xml index d58f3380..df20ce04 100644 --- a/presentation/src/main/res/values-gd/strings.xml +++ b/presentation/src/main/res/values-gd/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -365,7 +364,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-hi/strings.xml b/presentation/src/main/res/values-hi/strings.xml index 03b64188..f9096625 100644 --- a/presentation/src/main/res/values-hi/strings.xml +++ b/presentation/src/main/res/values-hi/strings.xml @@ -48,7 +48,6 @@ ब्लॉक संदेशों को सिंक्रनाइज़ कर रहा है.. । आप: %s - प्रारूप संदेशों में परिणाम %d संदेश आपकी बातचीत यहां दिखाई देगी @@ -357,7 +356,6 @@ सेट करें पूर्ववत करें प्रतिलिपि बनाई गई हैं। - संग्रहीत बातचीत इसका उपयोग करने के लिए आपको QUIK+ को अनलॉक करना होगा नई संदेश diff --git a/presentation/src/main/res/values-hr/strings.xml b/presentation/src/main/res/values-hr/strings.xml index 4cf3fc3f..e1e75c9e 100644 --- a/presentation/src/main/res/values-hr/strings.xml +++ b/presentation/src/main/res/values-hr/strings.xml @@ -48,7 +48,6 @@ Blokiraj Sinkronizacija poruka… Vi: %s - Skica Rezultati u porukama %d poruka Vaši razgovori pojavit će se ovdje @@ -361,7 +360,6 @@ Postavi Poništi Kopirano - Razgovor je arhiviran Morate otključati QUIK+ za korištenje ovog Nova poruka diff --git a/presentation/src/main/res/values-hu/strings.xml b/presentation/src/main/res/values-hu/strings.xml index 7fa5413a..0eb8cb3b 100644 --- a/presentation/src/main/res/values-hu/strings.xml +++ b/presentation/src/main/res/values-hu/strings.xml @@ -48,7 +48,6 @@ Tiltás Üzenetek szinkronizálása… Te: %s - Vázlat Eredmények az üzenetek szövegében %d üzenet A beszélgetéseid itt jelennek meg @@ -272,7 +271,7 @@ Tiltott számok A tiltott számok itt fognak megjelenni Új szám tiltása - Üzenetek tiltása: + Üzenetek tiltása Telefonszám Blokkolás Tiltott üzenetek @@ -357,7 +356,6 @@ Beállítás Visszavonás Átmásolva - Archivált beszélgetés Ehhez ki kell nyitnod a QUIK+-t Új üzenet diff --git a/presentation/src/main/res/values-in/strings.xml b/presentation/src/main/res/values-in/strings.xml index fa868c8d..9aed0134 100644 --- a/presentation/src/main/res/values-in/strings.xml +++ b/presentation/src/main/res/values-in/strings.xml @@ -48,7 +48,6 @@ Blokir Menyinkronkan pesan… Anda: %s - Draf Hasil dalam pesan %d pesan Percakapan anda akan ditampilkan di sini @@ -353,7 +352,6 @@ Set Urungkan Disalin - Percakapan diarsipkan Anda harus membuka akses QUIK+ untuk menggunakan ini %s pesan baru diff --git a/presentation/src/main/res/values-it/strings.xml b/presentation/src/main/res/values-it/strings.xml index 2d967a7b..e12454c0 100644 --- a/presentation/src/main/res/values-it/strings.xml +++ b/presentation/src/main/res/values-it/strings.xml @@ -48,7 +48,6 @@ Sposta negli indesiderati La sincronizzazione dei messaggi… Tu: %s - Bozza Risultati nei messaggi %d messaggi Le tue conversazioni vengono visualizzate qui @@ -357,7 +356,6 @@ Set Annulla Copiato - Conversazione archiviata È necessario sbloccare QUIK+ per utilizzare questo Nuovo messaggio diff --git a/presentation/src/main/res/values-iw/strings.xml b/presentation/src/main/res/values-iw/strings.xml index 5a9355f5..0ff878d0 100644 --- a/presentation/src/main/res/values-iw/strings.xml +++ b/presentation/src/main/res/values-iw/strings.xml @@ -48,7 +48,6 @@ חסום מסנכרן הודעות… אתה: %s - טיוטה תוצאות בהודעות %d הודעות ההתכתבויות שלך תופענה כאן @@ -365,7 +364,6 @@ הגדרה ביטול הועתק - התכתבות בארכיון עליך לשחרר את QUIK+‎ כדי להשתמש בזה הודעה חדשה diff --git a/presentation/src/main/res/values-ja/strings.xml b/presentation/src/main/res/values-ja/strings.xml index f90fcd1f..678db166 100644 --- a/presentation/src/main/res/values-ja/strings.xml +++ b/presentation/src/main/res/values-ja/strings.xml @@ -48,7 +48,6 @@ ブロック メッセージを同期しています... あなた: %s - 下書き メッセージ内の検索結果 %d 件のメッセージ 会話がここに表示されます @@ -353,7 +352,6 @@ 設定 元に戻す コピーしました - 会話をアーカイブしました 使用するには QUIK+ のロックを解除する必要があります %s 件の新着メッセージ diff --git a/presentation/src/main/res/values-ko/strings.xml b/presentation/src/main/res/values-ko/strings.xml index 3e20b3a0..e1e2fec2 100644 --- a/presentation/src/main/res/values-ko/strings.xml +++ b/presentation/src/main/res/values-ko/strings.xml @@ -48,7 +48,6 @@ 차단 메시지 동기화 하기 나: %s - 임시 메시지 메시지 검색 결과 %d 개의 새로운 메시지 대화가 여기에 나타납니다 @@ -353,7 +352,6 @@ 설정 되돌리기 복사됨 - 보관된 대화 이 기능을 사용하려면 QUIK+ 를 잠금 해제해야 합니다. 새로운 메세지 diff --git a/presentation/src/main/res/values-lt/strings.xml b/presentation/src/main/res/values-lt/strings.xml index 8c7bb1db..e5f65bd9 100644 --- a/presentation/src/main/res/values-lt/strings.xml +++ b/presentation/src/main/res/values-lt/strings.xml @@ -48,7 +48,6 @@ Blokuoti Syncing messages… Tu: %s - Draft Results in messages %d messages Tavo žinutės buvo matomos čia @@ -365,7 +364,6 @@ Padaryti Anuliuoti Nukopijuota - Archyvuotas pokalbis Reikia turėti QUIK+ funkcijos naudojomui Naujas pranešimas diff --git a/presentation/src/main/res/values-nb/strings.xml b/presentation/src/main/res/values-nb/strings.xml index 2db0f9c1..9ab68f19 100644 --- a/presentation/src/main/res/values-nb/strings.xml +++ b/presentation/src/main/res/values-nb/strings.xml @@ -48,7 +48,6 @@ Blokker Synkroniserer meldinger… Du: %s - Draft Resultater i meldinger %d meldinger Samtalene dine vises her @@ -357,7 +356,6 @@ Angi Angre Kopiert - Arkiverte samtaler Du må aktivere QUIK+ for å bruke dette Ny melding diff --git a/presentation/src/main/res/values-ne/strings.xml b/presentation/src/main/res/values-ne/strings.xml index 64fc5df4..f2237c64 100644 --- a/presentation/src/main/res/values-ne/strings.xml +++ b/presentation/src/main/res/values-ne/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-nl/strings.xml b/presentation/src/main/res/values-nl/strings.xml index a6f5200d..c6038b9f 100644 --- a/presentation/src/main/res/values-nl/strings.xml +++ b/presentation/src/main/res/values-nl/strings.xml @@ -48,7 +48,6 @@ Blokkeren Berichten synchroniseren… Jij: %s - Concept Resultaten in berichten %d berichten Je conversaties verschijnen hier @@ -357,7 +356,6 @@ Instellen Ongedaan maken Gekopieerd - Conversatie gearchiveerd Je dient QUIK+ te ontgrendelen om dit te gebruiken Nieuw bericht diff --git a/presentation/src/main/res/values-pl/strings.xml b/presentation/src/main/res/values-pl/strings.xml index b328f5d3..559f135e 100644 --- a/presentation/src/main/res/values-pl/strings.xml +++ b/presentation/src/main/res/values-pl/strings.xml @@ -58,7 +58,6 @@ Zmień nazwę rozmowy Synchronizowanie wiadomości… Ty: %s - Szkic Wyniki w wiadomościach %d wiadomości Miejsce dla twoich bieżących rozmów diff --git a/presentation/src/main/res/values-pt-rBR/strings.xml b/presentation/src/main/res/values-pt-rBR/strings.xml index 253ab69a..98ce5d5b 100644 --- a/presentation/src/main/res/values-pt-rBR/strings.xml +++ b/presentation/src/main/res/values-pt-rBR/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronizando mensagens… Você: %s - Rascunho Resultados nas mensagens %d mensagem(s) Suas conversas aparecerão aqui @@ -357,7 +356,6 @@ Definir Desfazer Copiada - Conversa arquivada Você deve desbloquear o QUIK+ para isso Nova mensagem diff --git a/presentation/src/main/res/values-pt/strings.xml b/presentation/src/main/res/values-pt/strings.xml index f49bb718..435bba94 100644 --- a/presentation/src/main/res/values-pt/strings.xml +++ b/presentation/src/main/res/values-pt/strings.xml @@ -48,7 +48,6 @@ Bloquear Sincronização de mensagens… Você: %s - Rascunho Resultados nas mensagens %d mensagens As suas conversas aparecerão aqui @@ -357,7 +356,6 @@ Definir Anular Copiada - Conversa arquivada Tem que ter o QUIK+ para esta função 1 nova mensagem diff --git a/presentation/src/main/res/values-ro/strings.xml b/presentation/src/main/res/values-ro/strings.xml index cff1b14e..77d51a79 100644 --- a/presentation/src/main/res/values-ro/strings.xml +++ b/presentation/src/main/res/values-ro/strings.xml @@ -54,7 +54,6 @@ Redenumește conversația Se sincronizează mesajele… Tu: %s - Schițe Rezultate în mesaje %d mesaje Conversațiile tale vor apărea aici diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml index d0afcc5c..7ffe682c 100644 --- a/presentation/src/main/res/values-ru/strings.xml +++ b/presentation/src/main/res/values-ru/strings.xml @@ -48,7 +48,6 @@ Блокировать Синхронизация сообщений… Вы: %s - Черновик Результаты в сообщениях %d сообщений Беседы будут появляться здесь @@ -365,7 +364,6 @@ Задать Отмена Скопировано - Архивированная беседа Вы должны разблокировать QUIK+, чтобы использовать Новое сообщение diff --git a/presentation/src/main/res/values-sk/strings.xml b/presentation/src/main/res/values-sk/strings.xml index 636c6a00..e0602809 100644 --- a/presentation/src/main/res/values-sk/strings.xml +++ b/presentation/src/main/res/values-sk/strings.xml @@ -48,7 +48,6 @@ Zablokovať Synchronizácia správ… Vy: %s - Koncept Výsledky v správach %d správ Tu sa zobrazia vaše konverzácie @@ -365,7 +364,6 @@ Nastaviť Vrátiť späť Skopírované - Archivované konverzácie Pre použitie aktivujte QUIK+ Nová správa diff --git a/presentation/src/main/res/values-sl/strings.xml b/presentation/src/main/res/values-sl/strings.xml index 4b6cecac..58feb536 100644 --- a/presentation/src/main/res/values-sl/strings.xml +++ b/presentation/src/main/res/values-sl/strings.xml @@ -48,7 +48,6 @@ Blokiraj Sinhroniziranje sporočil… Vi: %s - Osnutek Rezultati v sporočilih %d sporočil Vaši pogovori se bodo pojavili tukaj @@ -365,7 +364,6 @@ Nastavi Razveljavi Kopirano - Arhivirani pogovori Da uporabiš to, moraš odkleniti QUIK+ Novo sporočilo diff --git a/presentation/src/main/res/values-sr/strings.xml b/presentation/src/main/res/values-sr/strings.xml index b47b5f12..0489238c 100644 --- a/presentation/src/main/res/values-sr/strings.xml +++ b/presentation/src/main/res/values-sr/strings.xml @@ -48,7 +48,6 @@ Блокирај Синхронизујем поруке… Ја: %s - Нацрт Пронађено у порукама %d поруке Овде ће се појавити твоји разговори @@ -361,7 +360,6 @@ Постави Опозови Копирано - Сачувани разговори Откључај QUIK+ за приступ овој опцији Нова порука diff --git a/presentation/src/main/res/values-sv/strings.xml b/presentation/src/main/res/values-sv/strings.xml index c58d43a8..5b26f854 100644 --- a/presentation/src/main/res/values-sv/strings.xml +++ b/presentation/src/main/res/values-sv/strings.xml @@ -48,7 +48,6 @@ Blockera Synkroniserar meddelanden… Du: %s - Utkast Resultat i meddelanden %d meddelanden Dina konversationer kommer att dyka upp här @@ -357,7 +356,6 @@ Ställ in Ångra Kopierad - Arkiverade konversationer Du måste låsa upp QUIK+ för att använda det här Nytt meddelande diff --git a/presentation/src/main/res/values-ta/strings.xml b/presentation/src/main/res/values-ta/strings.xml index 091f8279..1c1f94bc 100644 --- a/presentation/src/main/res/values-ta/strings.xml +++ b/presentation/src/main/res/values-ta/strings.xml @@ -48,7 +48,6 @@ தடு செய்திகள் ஒத்திசைக்கப்படுகின்றன… நீங்கள்: %s - வரைவு தகவல்களிலுள்ள முடிவுகள் %d செய்திகள் உங்கள் உரையாடல்கள் இங்கே தோன்றும் @@ -357,7 +356,6 @@ அமை செயல்தவிர் நகலெடுக்கப்பட்டது - காப்பகப்படுத்திய உரையாடல் இதைப் பயன்படுத்த கட்டாயம் QUIK+ ஐப் பூட்டவிழ்க்க வேண்டும் புது தகவல் diff --git a/presentation/src/main/res/values-th/strings.xml b/presentation/src/main/res/values-th/strings.xml index 2292854d..d9b8df73 100644 --- a/presentation/src/main/res/values-th/strings.xml +++ b/presentation/src/main/res/values-th/strings.xml @@ -48,7 +48,6 @@ ปิดกั้น กำลังปรับแต่งเพิ่มประสิทธิภาพฐานข้อมูล อาจใช้เวลาสักครู่… คุณ: %s - Draft ผลลัพธ์ในข้อความ %d ข้อความ บทสนทนาของคุณจะปรากฏที่นี่ @@ -353,7 +352,6 @@ ตั้งค่า ย้อนกลับ คัดลอกแล้ว - จัดเก็บการสนทนาแล้ว คุณต้องปลดล็อก QUIK+ เพื่อใช้งานคุณสมบัตินี้ มี %s ข้อความใหม่ diff --git a/presentation/src/main/res/values-tl/strings.xml b/presentation/src/main/res/values-tl/strings.xml index 25f92882..f4b5abaf 100644 --- a/presentation/src/main/res/values-tl/strings.xml +++ b/presentation/src/main/res/values-tl/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… Ikaw: %s - Draft Resulta sa mga messages %d mga messages Ang iyong mga pakikipag-usap ay makikita rito @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml index 5fdaed1c..4a7426c5 100644 --- a/presentation/src/main/res/values-tr/strings.xml +++ b/presentation/src/main/res/values-tr/strings.xml @@ -48,7 +48,6 @@ Engelle İletiler eşitleniyor.. Sen: %s - Taslak Mesajlardaki sonuçlar %d mesaj Konuşmalarınız burada görünür @@ -359,7 +358,6 @@ BAĞLAM İSTEĞİ Ayarla Geri al Kopyalandı. - Arşivlenmiş konuşmalar Bunu kullanmak için QUIK+ kilidi gerekir Yeni mesaj diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml index 5cb6e66b..141935f3 100644 --- a/presentation/src/main/res/values-uk/strings.xml +++ b/presentation/src/main/res/values-uk/strings.xml @@ -48,7 +48,6 @@ Блокувати Синхронізація повідомлень… Ви: %s - Чернетка Результати в повідомленнях Повідомлень: %d Ваші бесіди з\'являтимуться тут @@ -365,7 +364,6 @@ Задати Скасувати Скопійовано - Бесіду заархівовано Для використання ви повинні розблокувати QUIK+ Нове повідомлення diff --git a/presentation/src/main/res/values-ur/strings.xml b/presentation/src/main/res/values-ur/strings.xml index a1194b43..16938f5b 100644 --- a/presentation/src/main/res/values-ur/strings.xml +++ b/presentation/src/main/res/values-ur/strings.xml @@ -48,7 +48,6 @@ Block Syncing messages… You: %s - Draft Results in messages %d messages Your conversations will appear here @@ -357,7 +356,6 @@ Set Undo Copied - Archived conversation You must unlock QUIK+ to use this New message diff --git a/presentation/src/main/res/values-vi/strings.xml b/presentation/src/main/res/values-vi/strings.xml index d9e04ecd..e8cc0437 100644 --- a/presentation/src/main/res/values-vi/strings.xml +++ b/presentation/src/main/res/values-vi/strings.xml @@ -48,7 +48,6 @@ Chặn liên hệ Đang đồng bộ tin nhắn… Bạn: %s - Bản nháp Kết quả trong tin nhắn %d tin nhắn Các cuộc trò chuyện của bạn sẽ xuất hiện ở đây @@ -353,7 +352,6 @@ Chọn Undo Đã sao chép - Cuộc trò chuyện đã được lưu trữ Bạn phải mở khóa QUIK+ để sử dụng chức năng này %s tin nhắn mới diff --git a/presentation/src/main/res/values-zh-rCN/strings.xml b/presentation/src/main/res/values-zh-rCN/strings.xml index ca5dcfb0..50770bd7 100644 --- a/presentation/src/main/res/values-zh-rCN/strings.xml +++ b/presentation/src/main/res/values-zh-rCN/strings.xml @@ -48,7 +48,6 @@ 拦截 正在同步信息… 你:%s - 草稿 信息中的结果 %d 条信息 对话会在这里显示 @@ -353,7 +352,6 @@ 设置 撤销 已复制 - 已存档的对话 您必须解锁 QUIK+ 才能使用此功能 %s条新信息 diff --git a/presentation/src/main/res/values-zh-rHK/strings.xml b/presentation/src/main/res/values-zh-rHK/strings.xml index c6061066..257393d3 100644 --- a/presentation/src/main/res/values-zh-rHK/strings.xml +++ b/presentation/src/main/res/values-zh-rHK/strings.xml @@ -48,7 +48,6 @@ 攔截 正在同步… 您:%s - 草稿 信息中的結果 %d 條信息 對話會在這裡顯示 @@ -353,7 +352,6 @@ 設置 復原 已複製 - 存檔的對話 您必須解鎖QUIK+才能使用此功能 %s條新訊息 diff --git a/presentation/src/main/res/values-zh-rTW/strings.xml b/presentation/src/main/res/values-zh-rTW/strings.xml index 6ce36a82..a6f1e4fb 100644 --- a/presentation/src/main/res/values-zh-rTW/strings.xml +++ b/presentation/src/main/res/values-zh-rTW/strings.xml @@ -48,7 +48,6 @@ 封鎖 正在同步訊息… 您:%s - 草稿 訊息中的結果 %d 條訊息 對話會在這裡顯示 @@ -355,7 +354,6 @@ 設定 復原 已複製 - 封存的對話 您必須解鎖 QUIK+ 才能使用此功能 新訊息 From e6e97dc28501246d19f82faf8f909670bfaf57fa Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:00:04 -0400 Subject: [PATCH 11/99] Create bump-and-build.yml --- .github/workflows/bump-and-build.yml | 96 ++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/bump-and-build.yml diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml new file mode 100644 index 00000000..ccd8a5e5 --- /dev/null +++ b/.github/workflows/bump-and-build.yml @@ -0,0 +1,96 @@ +name: Bump Feature Version and Build Release + +on: + workflow_dispatch: + +jobs: + bump-feature-version-and-build: + runs-on: ubuntu-latest + defaults: + run: + shell: bash + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Git user + run: | + git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + + # Ensure gradlew is executable (for fresh clones) + - name: Ensure gradlew is executable + run: chmod +x ./presentation/gradlew + + - name: Bump MINOR version in build.gradle (features update) + working-directory: presentation + run: | + # Extract current versionName and versionCode + VERSION_LINE=$(grep "versionName" build.gradle) + VERSION_NAME=$(echo "$VERSION_LINE" | sed -n "s/.*versionName[ ]*['\"]\([^'\"]*\)['\"].*/\1/p") + VERSION_CODE=$(grep "versionCode" build.gradle | awk '{print $2}') + + # Error handling for version parsing + if [[ ! "$VERSION_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Error: versionName is not in MAJOR.MINOR.PATCH format: $VERSION_NAME" + exit 1 + fi + if ! [[ "$VERSION_CODE" =~ ^[0-9]+$ ]]; then + echo "Error: versionCode is not an integer: $VERSION_CODE" + exit 1 + fi + + # Split versionName into major, minor, patch + IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION_NAME" + # Bump minor version, reset patch to 0 + MINOR=$((MINOR + 1)) + PATCH=0 + NEW_VERSION_NAME="$MAJOR.$MINOR.$PATCH" + NEW_VERSION_CODE=$((VERSION_CODE + 1)) + + # Update build.gradle in-place + sed -i "s/versionName.*/versionName '$NEW_VERSION_NAME'/" build.gradle + sed -i "s/versionCode.*/versionCode $NEW_VERSION_CODE/" build.gradle + + echo "Bumped version to $NEW_VERSION_NAME ($NEW_VERSION_CODE)" + + - name: Commit version bump + working-directory: presentation + run: | + git add build.gradle + git commit -m "chore: bump feature version [skip ci]" || echo "No changes to commit" + git push + + - name: Build Release + working-directory: presentation + run: ./gradlew assembleRelease + + # Find and upload APK artifacts for easy download + - name: Upload APK as artifact + if: always() + uses: actions/upload-artifact@v4 + with: + name: release-apk + path: | + presentation/build/outputs/apk/release/*.apk + presentation/app/build/outputs/apk/release/*.apk + # Adjust/add paths if your APKs are elsewhere + + # Optional: Show APK files found (for debugging) + - name: List built APKs + working-directory: presentation + run: | + echo "APK files in build/outputs/apk/release:" + ls -lh build/outputs/apk/release || echo "No APKs found" + echo "APK files in app/build/outputs/apk/release:" + ls -lh app/build/outputs/apk/release || echo "No APKs found" + + # Documentation for maintainers + - name: Workflow summary + run: | + echo "This workflow:" + echo "- Bumps the MINOR version and resets PATCH in presentation/build.gradle" + echo "- Commits and pushes the version update" + echo "- Builds the release APK" + echo "- Uploads the APK as a downloadable artifact" From b4e81f2b13a43b26c3ecebf8b78a15408019445c Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:20:52 -0400 Subject: [PATCH 12/99] sign, reference proper gradlew in release action --- .github/workflows/bump-and-build.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index ccd8a5e5..3901b898 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -21,7 +21,7 @@ jobs: # Ensure gradlew is executable (for fresh clones) - name: Ensure gradlew is executable - run: chmod +x ./presentation/gradlew + run: chmod +x ./gradlew - name: Bump MINOR version in build.gradle (features update) working-directory: presentation @@ -61,10 +61,18 @@ jobs: git add build.gradle git commit -m "chore: bump feature version [skip ci]" || echo "No changes to commit" git push - + + - name: Decode Keystore File + run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > ${{ github.workspace }}/my-release-key.keystore + - name: Build Release working-directory: presentation - run: ./gradlew assembleRelease + run: | + ../gradlew assembleRelease \ + -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ + -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ + -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ + -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} # Find and upload APK artifacts for easy download - name: Upload APK as artifact From 0d333590042787ea6163cd746db36d12e665ebde Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:25:09 -0400 Subject: [PATCH 13/99] Update bump-and-build.yml create PR, use signing keys --- .github/workflows/bump-and-build.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 3901b898..cc81b97c 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -55,12 +55,26 @@ jobs: echo "Bumped version to $NEW_VERSION_NAME ($NEW_VERSION_CODE)" - - name: Commit version bump + - name: Commit version bump and push branch working-directory: presentation run: | + BRANCH="bump-feature-version-$(date +'%Y%m%d-%H%M%S')" + git checkout -b "$BRANCH" git add build.gradle git commit -m "chore: bump feature version [skip ci]" || echo "No changes to commit" - git push + git push origin "$BRANCH" + echo "Pushed to branch $BRANCH. Please open a pull request to merge into master." + + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v6 + with: + commit-message: "chore: bump feature version [skip ci]" + branch: bump-feature-version + title: "chore: bump feature version [skip ci]" + body: "Automated version bump." + base: master + path: presentation/build.gradle - name: Decode Keystore File run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > ${{ github.workspace }}/my-release-key.keystore From 0a3f04a98e220b18b323a4d5415f8d6a6619650b Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:30:24 -0400 Subject: [PATCH 14/99] Update bump-and-build.yml rename apk --- .github/workflows/bump-and-build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index cc81b97c..79348d4f 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -87,17 +87,16 @@ jobs: -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} + + - name: Rename APK + run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk # Find and upload APK artifacts for easy download - name: Upload APK as artifact - if: always() uses: actions/upload-artifact@v4 with: name: release-apk - path: | - presentation/build/outputs/apk/release/*.apk - presentation/app/build/outputs/apk/release/*.apk - # Adjust/add paths if your APKs are elsewhere + path: presentation/build/outputs/apk/release/QUIK-release.apk # Optional: Show APK files found (for debugging) - name: List built APKs From 5ed2576fc46de70ff371670a146132925894dec1 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:37:01 -0400 Subject: [PATCH 15/99] Update bump-and-build.yml fix auto-commit --- .github/workflows/bump-and-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 79348d4f..e80ffcdc 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -74,7 +74,7 @@ jobs: title: "chore: bump feature version [skip ci]" body: "Automated version bump." base: master - path: presentation/build.gradle + # path: presentation/build.gradle - name: Decode Keystore File run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > ${{ github.workspace }}/my-release-key.keystore From 348884098c43b7b3794fe33a6853f8606591da0f Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:55:00 -0400 Subject: [PATCH 16/99] Update build.gradle remove dupe line, fix else missing {} --- presentation/build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index 280c4c7e..00f16f65 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -33,9 +33,6 @@ android { versionName '4.1.1' setProperty("archivesBaseName", "QUIK-v${versionName}") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - setProperty("archivesBaseName", "QUIK-v${versionName}") - // versionNameSuffix '-beta' } signingConfigs { @@ -47,8 +44,9 @@ android { keyAlias 'quik_release' if (keystorePropsFile.exists()) { keystoreProps.load(new FileInputStream(keystorePropsFile)) - } else - // do nothing + } else { + // do nothing + } storePassword keystoreProps['storePassword'] keyPassword keystoreProps['keyPassword'] } @@ -218,4 +216,4 @@ gradle.taskGraph.whenReady { taskGraph -> System.getenv("CI") != "true") { throw new GradleException("Keystore properties file not found") } -} \ No newline at end of file +} From 88a60b733502497a58a672afd95e5fcfff623d45 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 07:56:44 -0400 Subject: [PATCH 17/99] Update build-and-release.yml --- .github/workflows/build-and-release.yml | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 9ab8ba84..92d0e565 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -29,6 +29,38 @@ jobs: - name: List files in the APK directory run: ls -Rla ./ + - name: Bump MINOR version in build.gradle (features update) + working-directory: presentation + run: | + # Extract current versionName and versionCode + VERSION_LINE=$(grep "versionName" build.gradle) + VERSION_NAME=$(echo "$VERSION_LINE" | sed -n "s/.*versionName[ ]*['\"]\([^'\"]*\)['\"].*/\1/p") + VERSION_CODE=$(grep "versionCode" build.gradle | awk '{print $2}') + + # Error handling for version parsing + if [[ ! "$VERSION_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + echo "Error: versionName is not in MAJOR.MINOR.PATCH format: $VERSION_NAME" + exit 1 + fi + if ! [[ "$VERSION_CODE" =~ ^[0-9]+$ ]]; then + echo "Error: versionCode is not an integer: $VERSION_CODE" + exit 1 + fi + + # Split versionName into major, minor, patch + IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION_NAME" + # Bump minor version, reset patch to 0 + MINOR=$((MINOR + 1)) + PATCH=0 + NEW_VERSION_NAME="$MAJOR.$MINOR.$PATCH" + NEW_VERSION_CODE=$((VERSION_CODE + 1)) + + # Update build.gradle in-place + sed -i "s/versionName.*/versionName '$NEW_VERSION_NAME'/" build.gradle + sed -i "s/versionCode.*/versionCode $NEW_VERSION_CODE/" build.gradle + + echo "Bumped version to $NEW_VERSION_NAME ($NEW_VERSION_CODE)" + - name: Build APK run: | ./gradlew assembleRelease \ From 97d1368cdd913aa84d754f789035e3b06ab2fa63 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 08:11:28 -0400 Subject: [PATCH 18/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 197 +++++++++++++++------------ 1 file changed, 110 insertions(+), 87 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index e80ffcdc..850f1bea 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -1,117 +1,140 @@ -name: Bump Feature Version and Build Release - on: workflow_dispatch: + push: + tags: + - "v*" + +env: + APK_PATH: presentation/build/outputs/apk/release/QUIK-release.apk jobs: - bump-feature-version-and-build: + prepare: runs-on: ubuntu-latest - defaults: - run: - shell: bash - + outputs: + version_name: ${{ steps.bump.outputs.version_name }} + version_code: ${{ steps.bump.outputs.version_code }} + release_notes: ${{ steps.notes.outputs.notes }} steps: - - name: Checkout repository + - name: Checkout code uses: actions/checkout@v4 + with: + fetch-depth: 0 # fetch full history for git log & tags - - name: Set up Git user + - name: Configure Git run: | - git config --global user.name "github-actions[bot]" - git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" - # Ensure gradlew is executable (for fresh clones) - - name: Ensure gradlew is executable - run: chmod +x ./gradlew - - - name: Bump MINOR version in build.gradle (features update) + - name: Bump version in Gradle + id: bump working-directory: presentation run: | - # Extract current versionName and versionCode - VERSION_LINE=$(grep "versionName" build.gradle) - VERSION_NAME=$(echo "$VERSION_LINE" | sed -n "s/.*versionName[ ]*['\"]\([^'\"]*\)['\"].*/\1/p") - VERSION_CODE=$(grep "versionCode" build.gradle | awk '{print $2}') + LINE=$(grep "versionName" build.gradle) + VER=$(echo "$LINE" | sed -E "s/.*versionName ['\"]([0-9]+\.[0-9]+\.[0-9]+)['\"].*/\1/") + CODE=$(grep "versionCode" build.gradle | awk '{print $2}') + IFS='.' read MAJ MIN PAT <<<"$VER" + MIN=$((MIN + 1)); PAT=0 + NEW_VER="$MAJ.$MIN.$PAT" + NEW_CODE=$((CODE + 1)) + sed -i "s/versionName.*/versionName '$NEW_VER'/" build.gradle + sed -i "s/versionCode.*/versionCode $NEW_CODE/" build.gradle + echo "version_name=$NEW_VER" >> $GITHUB_OUTPUT + echo "version_code=$NEW_CODE" >> $GITHUB_OUTPUT - # Error handling for version parsing - if [[ ! "$VERSION_NAME" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - echo "Error: versionName is not in MAJOR.MINOR.PATCH format: $VERSION_NAME" - exit 1 - fi - if ! [[ "$VERSION_CODE" =~ ^[0-9]+$ ]]; then - echo "Error: versionCode is not an integer: $VERSION_CODE" - exit 1 - fi - - # Split versionName into major, minor, patch - IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION_NAME" - # Bump minor version, reset patch to 0 - MINOR=$((MINOR + 1)) - PATCH=0 - NEW_VERSION_NAME="$MAJOR.$MINOR.$PATCH" - NEW_VERSION_CODE=$((VERSION_CODE + 1)) - - # Update build.gradle in-place - sed -i "s/versionName.*/versionName '$NEW_VERSION_NAME'/" build.gradle - sed -i "s/versionCode.*/versionCode $NEW_VERSION_CODE/" build.gradle - - echo "Bumped version to $NEW_VERSION_NAME ($NEW_VERSION_CODE)" - - - name: Commit version bump and push branch - working-directory: presentation + - name: Generate release notes from commits + id: notes run: | - BRANCH="bump-feature-version-$(date +'%Y%m%d-%H%M%S')" + git fetch --tags + # find the previous tag, or root commit if none + LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) + NOTES=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s") + echo "::set-output name=notes::$NOTES" + + - name: Update changelog.json + run: | + VN=${{ steps.bump.outputs.version_name }} + VC=${{ steps.bump.outputs.version_code }} + NOTES="${{ steps.notes.outputs.notes }}" + # build JSON array of bullet lines + NOTES_JSON=$(printf '%s\n' "$NOTES" | jq -R . | jq -s .) + jq \ + --arg versionName "$VN" \ + --argjson versionCode "$VC" \ + --argjson notes "$NOTES_JSON" \ + '. += [{versionName: $versionName, versionCode: $versionCode, notes: $notes}]' \ + data/src/main/assets/changelog.json > changelog.tmp.json + mv changelog.tmp.json data/src/main/assets/changelog.json + + - name: Commit & push bump + changelog + run: | + BRANCH="bump/${{ steps.bump.outputs.version_name }}-${{ github.run_id }}" git checkout -b "$BRANCH" - git add build.gradle - git commit -m "chore: bump feature version [skip ci]" || echo "No changes to commit" - git push origin "$BRANCH" - echo "Pushed to branch $BRANCH. Please open a pull request to merge into master." - + git add presentation/build.gradle data/src/main/assets/changelog.json + git commit -m "chore: bump to ${{ steps.bump.outputs.version_name }} & update changelog [skip ci]" || exit 0 + git push --set-upstream origin "$BRANCH" - name: Create Pull Request uses: peter-evans/create-pull-request@v6 with: - commit-message: "chore: bump feature version [skip ci]" - branch: bump-feature-version - title: "chore: bump feature version [skip ci]" - body: "Automated version bump." + token: ${{ secrets.GITHUB_TOKEN }} + branch: bump/${{ steps.bump.outputs.version_name }}-${{ github.run_id }} base: master - # path: presentation/build.gradle - - - name: Decode Keystore File - run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > ${{ github.workspace }}/my-release-key.keystore - - - name: Build Release - working-directory: presentation + title: "chore: bump to ${{ steps.bump.outputs.version_name }}" + body: | + ## Release ${{ steps.bump.outputs.version_name }} + ${{ steps.notes.outputs.notes }} + + build: + needs: prepare + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Decode Keystore + run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > my-release-key.keystore + + - name: Make gradlew executable + run: chmod +x ./gradlew + + - name: Build Release APK run: | - ../gradlew assembleRelease \ - -Pandroid.injected.signing.store.file=${{ github.workspace }}/my-release-key.keystore \ + ./gradlew presentation:assembleRelease \ + -Pandroid.injected.signing.store.file=$PWD/my-release-key.keystore \ -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - - - name: Rename APK - run: mv presentation/build/outputs/apk/release/QUIK-v*-release.apk presentation/build/outputs/apk/release/QUIK-release.apk - # Find and upload APK artifacts for easy download - - name: Upload APK as artifact + - name: Rename APK + run: mv presentation/build/outputs/apk/release/QUIK-*-release.apk $APK_PATH + + - name: Upload APK artifact uses: actions/upload-artifact@v4 with: - name: release-apk - path: presentation/build/outputs/apk/release/QUIK-release.apk + name: QUIK-release.apk + path: $APK_PATH - # Optional: Show APK files found (for debugging) - - name: List built APKs - working-directory: presentation - run: | - echo "APK files in build/outputs/apk/release:" - ls -lh build/outputs/apk/release || echo "No APKs found" - echo "APK files in app/build/outputs/apk/release:" - ls -lh app/build/outputs/apk/release || echo "No APKs found" + release: + if: github.event_name == 'push' + needs: build + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 - # Documentation for maintainers - - name: Workflow summary + - name: Generate release notes from commits + id: notes run: | - echo "This workflow:" - echo "- Bumps the MINOR version and resets PATCH in presentation/build.gradle" - echo "- Commits and pushes the version update" - echo "- Builds the release APK" - echo "- Uploads the APK as a downloadable artifact" + git fetch --tags + LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) + NOTES=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s") + echo "::set-output name=notes::$NOTES" + + - name: Create GitHub Release + uses: actions/create-release@v1 + with: + tag_name: ${{ github.ref_name }} + body: ${{ steps.notes.outputs.notes }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 121baf043570e7d0b5957ea7680ba40e05622479 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 08:13:05 -0400 Subject: [PATCH 19/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 850f1bea..a32d255b 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -1,3 +1,4 @@ +name: Bump Feat. & Build Release on: workflow_dispatch: push: From d710bfc8bdf39cb6620efc76c45c52b11d6f17dc Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 08:35:26 -0400 Subject: [PATCH 20/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 42 +++++++++++++++++++--------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index a32d255b..03fc4025 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -19,7 +19,12 @@ jobs: - name: Checkout code uses: actions/checkout@v4 with: - fetch-depth: 0 # fetch full history for git log & tags + fetch-depth: 0 # full history & tags + + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install -y jq dos2unix - name: Configure Git run: | @@ -30,6 +35,7 @@ jobs: id: bump working-directory: presentation run: | + dos2unix build.gradle LINE=$(grep "versionName" build.gradle) VER=$(echo "$LINE" | sed -E "s/.*versionName ['\"]([0-9]+\.[0-9]+\.[0-9]+)['\"].*/\1/") CODE=$(grep "versionCode" build.gradle | awk '{print $2}') @@ -37,26 +43,25 @@ jobs: MIN=$((MIN + 1)); PAT=0 NEW_VER="$MAJ.$MIN.$PAT" NEW_CODE=$((CODE + 1)) - sed -i "s/versionName.*/versionName '$NEW_VER'/" build.gradle - sed -i "s/versionCode.*/versionCode $NEW_CODE/" build.gradle - echo "version_name=$NEW_VER" >> $GITHUB_OUTPUT - echo "version_code=$NEW_CODE" >> $GITHUB_OUTPUT + sed -i -E "s/versionName ['\"].*['\"]/versionName '$NEW_VER'/" build.gradle + sed -i -E "s/versionCode [0-9]+/versionCode $NEW_CODE/" build.gradle + echo "version_name=$NEW_VER" >> $GITHUB_OUTPUT + echo "version_code=$NEW_CODE" >> $GITHUB_OUTPUT - name: Generate release notes from commits id: notes run: | git fetch --tags - # find the previous tag, or root commit if none LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) NOTES=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s") echo "::set-output name=notes::$NOTES" - name: Update changelog.json run: | + dos2unix data/src/main/assets/changelog.json VN=${{ steps.bump.outputs.version_name }} VC=${{ steps.bump.outputs.version_code }} NOTES="${{ steps.notes.outputs.notes }}" - # build JSON array of bullet lines NOTES_JSON=$(printf '%s\n' "$NOTES" | jq -R . | jq -s .) jq \ --arg versionName "$VN" \ @@ -66,6 +71,9 @@ jobs: data/src/main/assets/changelog.json > changelog.tmp.json mv changelog.tmp.json data/src/main/assets/changelog.json + - name: Validate changelog.json + run: jq . data/src/main/assets/changelog.json > /dev/null + - name: Commit & push bump + changelog run: | BRANCH="bump/${{ steps.bump.outputs.version_name }}-${{ github.run_id }}" @@ -89,7 +97,8 @@ jobs: needs: prepare runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout code + uses: actions/checkout@v4 - name: Decode Keystore run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > my-release-key.keystore @@ -105,17 +114,23 @@ jobs: -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - - name: Rename APK - run: mv presentation/build/outputs/apk/release/QUIK-*-release.apk $APK_PATH + - name: Rename APK into known path + run: | + mkdir -p "$(dirname "${{ env.APK_PATH }}")" + mv presentation/build/outputs/apk/release/*.apk "${{ env.APK_PATH }}" - name: Upload APK artifact uses: actions/upload-artifact@v4 with: name: QUIK-release.apk - path: $APK_PATH + path: ${{ env.APK_PATH }} + if-no-files-found: warn + compression-level: 6 + overwrite: false + include-hidden-files: false release: - if: github.event_name == 'push' + if: ${{ github.event_name == 'workflow_dispatch' }} needs: build runs-on: ubuntu-latest steps: @@ -129,7 +144,8 @@ jobs: run: | git fetch --tags LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) - NOTES=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s") + git log "$LAST_TAG"..HEAD --pretty=format:"* %s" > release_notes.md + NOTES=$(sed -e ':a;N;$!ba;s/\n/\\n/g' release_notes.md) echo "::set-output name=notes::$NOTES" - name: Create GitHub Release From a0a1c271ec560aac215641196fed8f04048714da Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 13:56:43 -0400 Subject: [PATCH 21/99] Create dev.octoshrimpy.quik.yml --- fdroid/metadata/dev.octoshrimpy.quik.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 fdroid/metadata/dev.octoshrimpy.quik.yml diff --git a/fdroid/metadata/dev.octoshrimpy.quik.yml b/fdroid/metadata/dev.octoshrimpy.quik.yml new file mode 100644 index 00000000..9a6d9b14 --- /dev/null +++ b/fdroid/metadata/dev.octoshrimpy.quik.yml @@ -0,0 +1,20 @@ +PackageName: dev.octoshrimpy.quik +Name: QUIK +Summary: The most beautiful SMS messenger for Android +License: GPL-3.0 +AuthorName: Marcos Jones +SourceCode: https://github.com/octoshrimpy/quik +IssueTracker: https://github.com/octoshrimpy/quik/issues +WebSite: "" +Categories: + - Communication + - Internet +AntiFeatures: NonFreeNet +CurrentVersion: "4.1.1" +CurrentVersionCode: 2229 +Description: | + QUIK is an open source replacement for the stock messaging app on Android. + It displays SMS/MMS conversations, supports scheduled sends, backups, voice + messages, speech-to-text and text-to-speech, and more. + QUIK connects to public APIs (e.g. Space Devs) for news and may fetch + thumbnails from third-party hosts, so it’s marked as NonFreeNet. From 63eb7e6d2400236551b887b0f0aa9bcc07571ef2 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:08:22 -0400 Subject: [PATCH 22/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 268 ++++++++++++++------------- 1 file changed, 140 insertions(+), 128 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 03fc4025..dd0d952f 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -1,157 +1,169 @@ -name: Bump Feat. & Build Release +name: Bump + Release + F-Droid + on: workflow_dispatch: push: tags: - "v*" -env: - APK_PATH: presentation/build/outputs/apk/release/QUIK-release.apk - jobs: - prepare: + release: runs-on: ubuntu-latest - outputs: - version_name: ${{ steps.bump.outputs.version_name }} - version_code: ${{ steps.bump.outputs.version_code }} - release_notes: ${{ steps.notes.outputs.notes }} + env: + META_YML: fdroid/metadata/dev.octoshrimpy.quik.yml + GRADLE_FILE: presentation/build.gradle + CHANGELOG: "data/src/main/assets/changelog.json" + steps: - - name: Checkout code - uses: actions/checkout@v4 + # 1) Checkout full history so tags are available + - uses: actions/checkout@v4 with: - fetch-depth: 0 # full history & tags + fetch-depth: 0 + persist-credentials: true - - name: Install dependencies + # 2) Install fdroidserver & bump metadata.yml + - name: Set up Python & fdroidserver + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Bump F-Droid metadata run: | - sudo apt-get update - sudo apt-get install -y jq dos2unix - - - name: Configure Git + pip3 install fdroidserver + fdroid update --skip-pulls --checkmetadata "$META_YML" + - name: Commit F-Droid metadata.yml run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" + git add "$META_YML" + git diff --quiet --cached || git commit -m "chore: bump F-Droid metadata" - - name: Bump version in Gradle + # 3) Set up Java & jq for the rest + - name: Set up Java 17 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: '17' + - name: Install jq + run: sudo apt-get update && sudo apt-get install -y jq + + # 4) Bump Android versions & capture NEW_CODE/NEW_NAME + - name: Bump Android version & update build.gradle id: bump - working-directory: presentation run: | - dos2unix build.gradle - LINE=$(grep "versionName" build.gradle) - VER=$(echo "$LINE" | sed -E "s/.*versionName ['\"]([0-9]+\.[0-9]+\.[0-9]+)['\"].*/\1/") - CODE=$(grep "versionCode" build.gradle | awk '{print $2}') - IFS='.' read MAJ MIN PAT <<<"$VER" - MIN=$((MIN + 1)); PAT=0 - NEW_VER="$MAJ.$MIN.$PAT" - NEW_CODE=$((CODE + 1)) - sed -i -E "s/versionName ['\"].*['\"]/versionName '$NEW_VER'/" build.gradle - sed -i -E "s/versionCode [0-9]+/versionCode $NEW_CODE/" build.gradle - echo "version_name=$NEW_VER" >> $GITHUB_OUTPUT - echo "version_code=$NEW_CODE" >> $GITHUB_OUTPUT + set -euo pipefail - - name: Generate release notes from commits - id: notes + # extract current + current_code=$(grep -E '^[[:space:]]*versionCode ' "$GRADLE_FILE" | awk '{print $2}') + current_name=$(grep -E '^[[:space:]]*versionName ' "$GRADLE_FILE" \ + | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + + # bump + new_code=$((current_code + 1)) + IFS='.' read -r major minor patch <<< "$current_name" + new_name="${major}.$((minor + 1)).0" + + # apply + sed -i \ + -e "s|^[[:space:]]*versionCode[[:space:]]\+$current_code|versionCode $new_code|" \ + -e "s|^[[:space:]]*versionName[[:space:]]\+'$current_name'|versionName '$new_name'|" \ + "$GRADLE_FILE" + + echo "NEW_CODE=$new_code" >> $GITHUB_ENV + echo "NEW_NAME=$new_name" >> $GITHUB_ENV + echo "Bumped to $new_name ($new_code)" + + # 5) Gather commits & prepend to changelog.json + - name: Update changelog.json & write F-Droid txt run: | - git fetch --tags - LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) - NOTES=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s") - echo "::set-output name=notes::$NOTES" + set -euo pipefail - - name: Update changelog.json + # determine previous tag or fallback + prev_tag="v${{ env.NEW_NAME%.* }}.${{ env.NEW_NAME#*. }}" + if git rev-parse --verify --quiet "$prev_tag"; then + base="$prev_tag" + else + # latest numeric tag + base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") + fi + + [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" + + # gather, clean, dedupe, oldest→newest + mapfile -t commits < <( + git log --no-merges --reverse --pretty=format:"%s by %an" $range \ + | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ + | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//' \ + | awk '!seen[$0]++' + ) + + # build JSON array + if (( ${#commits[@]} )); then + changes_json=$(printf '%s\n' "${commits[@]}" | jq -R . | jq -s .) + else + changes_json="[]" + fi + + # prepend new entry + jq --argjson changes "$changes_json" \ + --arg vc "$new_code" \ + --arg vn "$new_name" \ + ' + # 1) helper to capitalize first character + def capfirst: + sub("^(.)"; "\(ascii_upcase(.1))"); + + # 2) apply capitalization to all changes + $all := ($changes | map(capfirst)); + + # 3) split into fixes vs other changes + $fixes := $all | map(select(test("^(Fix|fix)"))); + $others := $all | map(select(test("^(Fix|fix)") | not)); + + # 4) build the new entry object with both fields + . = [{ + versionCode: ($vc | tonumber), + versionName: $vn, + fixes: $fixes, + changes: $others + }] + . + ' \ + "$CHANGELOG" > "${CHANGELOG}.tmp" \ + && mv "${CHANGELOG}.tmp" "$CHANGELOG" + + # write fdroid/metadata/.txt + mkdir -p fdroid/metadata + out="fdroid/metadata/${{ env.NEW_CODE }}.txt" + { + echo "Changes in ${{ env.NEW_NAME }} (${{ env.NEW_CODE }}):" + echo + for c in "${commits[@]}"; do echo "- $c"; done + } > "$out" + + # 6) Commit all metadata, changelog & build.gradle + - name: Commit version & changelog run: | - dos2unix data/src/main/assets/changelog.json - VN=${{ steps.bump.outputs.version_name }} - VC=${{ steps.bump.outputs.version_code }} - NOTES="${{ steps.notes.outputs.notes }}" - NOTES_JSON=$(printf '%s\n' "$NOTES" | jq -R . | jq -s .) - jq \ - --arg versionName "$VN" \ - --argjson versionCode "$VC" \ - --argjson notes "$NOTES_JSON" \ - '. += [{versionName: $versionName, versionCode: $versionCode, notes: $notes}]' \ - data/src/main/assets/changelog.json > changelog.tmp.json - mv changelog.tmp.json data/src/main/assets/changelog.json + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${{ env.NEW_CODE }}".txt + git diff --quiet --cached || git commit -m "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + git push - - name: Validate changelog.json - run: jq . data/src/main/assets/changelog.json > /dev/null + # 7) Build the APK + - name: Build release APK + run: ./gradlew clean :presentation:assembleRelease - - name: Commit & push bump + changelog + # 8) Tag & push + - name: Tag new release run: | - BRANCH="bump/${{ steps.bump.outputs.version_name }}-${{ github.run_id }}" - git checkout -b "$BRANCH" - git add presentation/build.gradle data/src/main/assets/changelog.json - git commit -m "chore: bump to ${{ steps.bump.outputs.version_name }} & update changelog [skip ci]" || exit 0 - git push --set-upstream origin "$BRANCH" + git tag "v${{ env.NEW_NAME }}" + git push origin "v${{ env.NEW_NAME }}" - - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 + # 9) Create GitHub Release & upload APK + - name: Publish GitHub Release + uses: softprops/action-gh-release@v1 with: - token: ${{ secrets.GITHUB_TOKEN }} - branch: bump/${{ steps.bump.outputs.version_name }}-${{ github.run_id }} - base: master - title: "chore: bump to ${{ steps.bump.outputs.version_name }}" - body: | - ## Release ${{ steps.bump.outputs.version_name }} - ${{ steps.notes.outputs.notes }} - - build: - needs: prepare - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Decode Keystore - run: echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > my-release-key.keystore - - - name: Make gradlew executable - run: chmod +x ./gradlew - - - name: Build Release APK - run: | - ./gradlew presentation:assembleRelease \ - -Pandroid.injected.signing.store.file=$PWD/my-release-key.keystore \ - -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ - -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ - -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - - - name: Rename APK into known path - run: | - mkdir -p "$(dirname "${{ env.APK_PATH }}")" - mv presentation/build/outputs/apk/release/*.apk "${{ env.APK_PATH }}" - - - name: Upload APK artifact - uses: actions/upload-artifact@v4 - with: - name: QUIK-release.apk - path: ${{ env.APK_PATH }} - if-no-files-found: warn - compression-level: 6 - overwrite: false - include-hidden-files: false - - release: - if: ${{ github.event_name == 'workflow_dispatch' }} - needs: build - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Generate release notes from commits - id: notes - run: | - git fetch --tags - LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) - git log "$LAST_TAG"..HEAD --pretty=format:"* %s" > release_notes.md - NOTES=$(sed -e ':a;N;$!ba;s/\n/\\n/g' release_notes.md) - echo "::set-output name=notes::$NOTES" - - - name: Create GitHub Release - uses: actions/create-release@v1 - with: - tag_name: ${{ github.ref_name }} - body: ${{ steps.notes.outputs.notes }} + tag_name: "v${{ env.NEW_NAME }}" + files: presentation/build/outputs/apk/release/*-release.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + From c032ee246daa917290783aef25057c453db8e2b7 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:12:11 -0400 Subject: [PATCH 23/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index dd0d952f..975033b2 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -78,12 +78,19 @@ jobs: set -euo pipefail # determine previous tag or fallback - prev_tag="v${{ env.NEW_NAME%.* }}.${{ env.NEW_NAME#*. }}" - if git rev-parse --verify --quiet "$prev_tag"; then + # try the exact tag for LAST release, based on NEW_NAME + prev_tag="v${NEW_NAME}" + if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then base="$prev_tag" + echo "ℹ️ Found previous tag $prev_tag" else - # latest numeric tag + # fallback: latest numeric tag base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") + if [[ -n "$base" ]]; then + echo "ℹ️ Previous tag $prev_tag not found; using latest tag $base" + else + echo "⚠️ No tags found; including entire history" + fi fi [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" From 60d7c9152545c97e21ce8363078568ffb1229d4c Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:21:59 -0400 Subject: [PATCH 24/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 975033b2..202f04cf 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -49,6 +49,7 @@ jobs: # 4) Bump Android versions & capture NEW_CODE/NEW_NAME - name: Bump Android version & update build.gradle id: bump + shell: bash run: | set -euo pipefail @@ -68,8 +69,8 @@ jobs: -e "s|^[[:space:]]*versionName[[:space:]]\+'$current_name'|versionName '$new_name'|" \ "$GRADLE_FILE" - echo "NEW_CODE=$new_code" >> $GITHUB_ENV - echo "NEW_NAME=$new_name" >> $GITHUB_ENV + echo "NEW_CODE=$new_code" >> "$GITHUB_ENV" + echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" echo "Bumped to $new_name ($new_code)" # 5) Gather commits & prepend to changelog.json From 5193d4a39b570af6eb1c9b05d889a88a726b7a09 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:25:01 -0400 Subject: [PATCH 25/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 202f04cf..e984b413 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -29,7 +29,7 @@ jobs: - name: Bump F-Droid metadata run: | pip3 install fdroidserver - fdroid update --skip-pulls --checkmetadata "$META_YML" + fdroid update - name: Commit F-Droid metadata.yml run: | git config user.name "github-actions[bot]" From 8b7d6a173792ec0c585e611273d271bd863f74c0 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:34:39 -0400 Subject: [PATCH 26/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 121 +++++++++++++++------------ 1 file changed, 66 insertions(+), 55 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index e984b413..5adc8e39 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -12,7 +12,7 @@ jobs: env: META_YML: fdroid/metadata/dev.octoshrimpy.quik.yml GRADLE_FILE: presentation/build.gradle - CHANGELOG: "data/src/main/assets/changelog.json" + CHANGELOG: data/src/main/assets/changelog.json steps: # 1) Checkout full history so tags are available @@ -21,7 +21,23 @@ jobs: fetch-depth: 0 persist-credentials: true - # 2) Install fdroidserver & bump metadata.yml + # 2) Decode your signing keystore from the secret + - name: Decode Android keystore + run: | + echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 + + # 3) Write a temporary F-Droid config.yml from secrets + - name: Write F-Droid config.yml + run: | + cat > config.yml <> "$GITHUB_ENV" echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" - echo "Bumped to $new_name ($new_code)" + echo "✅ Bumped to versionCode $new_code, versionName $new_name" - # 5) Gather commits & prepend to changelog.json + # 7) Gather commits & prepend to changelog.json - name: Update changelog.json & write F-Droid txt + shell: bash run: | set -euo pipefail # determine previous tag or fallback - # try the exact tag for LAST release, based on NEW_NAME prev_tag="v${NEW_NAME}" if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then base="$prev_tag" - echo "ℹ️ Found previous tag $prev_tag" else - # fallback: latest numeric tag base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") - if [[ -n "$base" ]]; then - echo "ℹ️ Previous tag $prev_tag not found; using latest tag $base" - else - echo "⚠️ No tags found; including entire history" - fi fi - [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" - # gather, clean, dedupe, oldest→newest + # collect, clean, dedupe (oldest→newest) mapfile -t commits < <( git log --no-merges --reverse --pretty=format:"%s by %an" $range \ | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ @@ -111,67 +120,69 @@ jobs: changes_json="[]" fi - # prepend new entry + # prepend new entry with fixes/changes split + capitalization jq --argjson changes "$changes_json" \ - --arg vc "$new_code" \ - --arg vn "$new_name" \ - ' - # 1) helper to capitalize first character - def capfirst: - sub("^(.)"; "\(ascii_upcase(.1))"); + --arg vc "$NEW_CODE" \ + --arg vn "$NEW_NAME" \ + ' + def capfirst: sub("^(.)"; "\(ascii_upcase(.1))"); + $all := ($changes | map(capfirst)); + $fixes := $all | map(select(test("^(Fix|fix)"))); + $others := $all | map(select(test("^(Fix|fix)") | not)); + . = [{ + versionCode: ($vc|tonumber), + versionName: $vn, + fixes: $fixes, + changes: $others + }] + . + ' \ + "$CHANGELOG" > tmp && mv tmp "$CHANGELOG" - # 2) apply capitalization to all changes - $all := ($changes | map(capfirst)); - - # 3) split into fixes vs other changes - $fixes := $all | map(select(test("^(Fix|fix)"))); - $others := $all | map(select(test("^(Fix|fix)") | not)); - - # 4) build the new entry object with both fields - . = [{ - versionCode: ($vc | tonumber), - versionName: $vn, - fixes: $fixes, - changes: $others - }] + . - ' \ - "$CHANGELOG" > "${CHANGELOG}.tmp" \ - && mv "${CHANGELOG}.tmp" "$CHANGELOG" - - # write fdroid/metadata/.txt + # write fdroid metadata text mkdir -p fdroid/metadata - out="fdroid/metadata/${{ env.NEW_CODE }}.txt" + out="fdroid/metadata/${NEW_CODE}.txt" { - echo "Changes in ${{ env.NEW_NAME }} (${{ env.NEW_CODE }}):" + echo "Changes in ${NEW_NAME} (${NEW_CODE}):" echo for c in "${commits[@]}"; do echo "- $c"; done } > "$out" - # 6) Commit all metadata, changelog & build.gradle + # 8) Commit all metadata, changelog & build.gradle - name: Commit version & changelog run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" - git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${{ env.NEW_CODE }}".txt - git diff --quiet --cached || git commit -m "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${NEW_CODE}".txt + git diff --quiet --cached || git commit -m "chore: bump to ${NEW_NAME} (${NEW_CODE})" git push - # 7) Build the APK + # 9) Build the APK (using the same keystore.p12) - name: Build release APK - run: ./gradlew clean :presentation:assembleRelease + run: | + chmod +x ./gradlew + ./gradlew clean :presentation:assembleRelease \ + -Pandroid.injected.signing.store.file=keystore.p12 \ + -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ + -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ + -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - # 8) Tag & push + # 10) Tag & push - name: Tag new release run: | - git tag "v${{ env.NEW_NAME }}" - git push origin "v${{ env.NEW_NAME }}" + git tag "v${NEW_NAME}" + git push origin "v${NEW_NAME}" - # 9) Create GitHub Release & upload APK + # 11) Publish GitHub Release & upload APK - name: Publish GitHub Release uses: softprops/action-gh-release@v1 with: - tag_name: "v${{ env.NEW_NAME }}" + tag_name: "v${NEW_NAME}" files: presentation/build/outputs/apk/release/*-release.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # 12) Cleanup signing material + - name: Cleanup keystore/config + if: always() + run: | + shred --remove keystore.p12 config.yml From 0143735872a234bbb8eec09252916f018ea461a0 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:38:27 -0400 Subject: [PATCH 27/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 5adc8e39..39f45196 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -45,7 +45,7 @@ jobs: - name: Bump F-Droid metadata run: | pip3 install fdroidserver - fdroid update --non-interactive --package dev.octoshrimpy.quik --config config.yml + fdroid update - name: Commit F-Droid metadata.yml run: | From f9d6b825547238a35a309fa726fe342c9f24e882 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:47:33 -0400 Subject: [PATCH 28/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 46 +++++++++------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 39f45196..059a1f9b 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -26,15 +26,15 @@ jobs: run: | echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 - # 3) Write a temporary F-Droid config.yml from secrets + # 3) Write a lowercase-key F-Droid config.yml from secrets - name: Write F-Droid config.yml run: | cat > config.yml <> "$GITHUB_ENV" echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" echo "✅ Bumped to versionCode $new_code, versionName $new_name" - # 7) Gather commits & prepend to changelog.json + # 8) Gather commits & prepend to changelog.json - name: Update changelog.json & write F-Droid txt shell: bash run: | set -euo pipefail - - # determine previous tag or fallback prev_tag="v${NEW_NAME}" if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then base="$prev_tag" @@ -104,23 +96,17 @@ jobs: base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") fi [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" - - # collect, clean, dedupe (oldest→newest) mapfile -t commits < <( git log --no-merges --reverse --pretty=format:"%s by %an" $range \ | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//' \ | awk '!seen[$0]++' ) - - # build JSON array if (( ${#commits[@]} )); then changes_json=$(printf '%s\n' "${commits[@]}" | jq -R . | jq -s .) else changes_json="[]" fi - - # prepend new entry with fixes/changes split + capitalization jq --argjson changes "$changes_json" \ --arg vc "$NEW_CODE" \ --arg vn "$NEW_NAME" \ @@ -137,8 +123,6 @@ jobs: }] + . ' \ "$CHANGELOG" > tmp && mv tmp "$CHANGELOG" - - # write fdroid metadata text mkdir -p fdroid/metadata out="fdroid/metadata/${NEW_CODE}.txt" { @@ -147,7 +131,7 @@ jobs: for c in "${commits[@]}"; do echo "- $c"; done } > "$out" - # 8) Commit all metadata, changelog & build.gradle + # 9) Commit all metadata, changelog & build.gradle - name: Commit version & changelog run: | git config user.name "github-actions[bot]" @@ -156,7 +140,7 @@ jobs: git diff --quiet --cached || git commit -m "chore: bump to ${NEW_NAME} (${NEW_CODE})" git push - # 9) Build the APK (using the same keystore.p12) + # 10) Build the APK (using the same keystore.p12) - name: Build release APK run: | chmod +x ./gradlew @@ -166,13 +150,13 @@ jobs: -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - # 10) Tag & push + # 11) Tag & push - name: Tag new release run: | git tag "v${NEW_NAME}" git push origin "v${NEW_NAME}" - # 11) Publish GitHub Release & upload APK + # 12) Publish GitHub Release & upload APK - name: Publish GitHub Release uses: softprops/action-gh-release@v1 with: @@ -181,7 +165,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # 12) Cleanup signing material + # 13) Cleanup signing material - name: Cleanup keystore/config if: always() run: | From e6981075f97b04c05be0f5b386b72483ce6190f7 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 14:53:04 -0400 Subject: [PATCH 29/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 059a1f9b..4ca0c288 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -25,6 +25,12 @@ jobs: - name: Decode Android keystore run: | echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 + + - name: Install repo icon + run: | + mkdir -p repo/icons/metadata/en-US/images + cp metadata/en-US/images/icon.png \ + repo/icons/metadata/en-US/images/icon.png # 3) Write a lowercase-key F-Droid config.yml from secrets - name: Write F-Droid config.yml From 2694b44c16c3199afc88bc192022603e518331c8 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 15:02:16 -0400 Subject: [PATCH 30/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 54 ++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 4ca0c288..8f1cfb09 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -25,14 +25,15 @@ jobs: - name: Decode Android keystore run: | echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 - + + # 3) Ensure your repo icon is in the right place - name: Install repo icon run: | mkdir -p repo/icons/metadata/en-US/images cp metadata/en-US/images/icon.png \ repo/icons/metadata/en-US/images/icon.png - # 3) Write a lowercase-key F-Droid config.yml from secrets + # 4) Write a lowercase-key F-Droid config.yml from secrets - name: Write F-Droid config.yml run: | cat > config.yml <> "$GITHUB_ENV" echo "✅ Bumped to versionCode $new_code, versionName $new_name" - # 8) Gather commits & prepend to changelog.json + # 9) Gather commits & prepend to changelog.json - name: Update changelog.json & write F-Droid txt shell: bash run: | @@ -137,16 +138,38 @@ jobs: for c in "${commits[@]}"; do echo "- $c"; done } > "$out" - # 9) Commit all metadata, changelog & build.gradle - - name: Commit version & changelog + # 10) Commit version bump, changelog & metadata TXT + - name: Commit version bump & changelog run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${NEW_CODE}".txt git diff --quiet --cached || git commit -m "chore: bump to ${NEW_NAME} (${NEW_CODE})" - git push - # 10) Build the APK (using the same keystore.p12) + # 11) Push bump branch instead of master + - name: Push bump branch + run: | + git checkout -b bump/${NEW_NAME}-${NEW_CODE} + git push --set-upstream origin bump/${NEW_NAME}-${NEW_CODE} + + # 12) Create & auto-merge PR + - name: Create & auto-merge PR + uses: peter-evans/create-pull-request@v5 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: chore: bump to ${NEW_NAME} (${NEW_CODE}) + title: chore: bump to ${NEW_NAME} (${NEW_CODE}) + body: | + This PR bumps: + - versionCode → ${NEW_CODE} + - versionName → ${NEW_NAME} + branch: bump/${NEW_NAME}-${NEW_CODE} + base: master + labels: automated + merge-method: merge + auto-merge: true + + # 13) Build the APK (using the same keystore.p12) - name: Build release APK run: | chmod +x ./gradlew @@ -156,13 +179,16 @@ jobs: -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - # 11) Tag & push + # 14) Tag & push tag (on master after auto-merge) - name: Tag new release run: | + git fetch origin master + git checkout master + git pull git tag "v${NEW_NAME}" git push origin "v${NEW_NAME}" - # 12) Publish GitHub Release & upload APK + # 15) Publish GitHub Release & upload APK - name: Publish GitHub Release uses: softprops/action-gh-release@v1 with: @@ -171,7 +197,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # 13) Cleanup signing material + # 16) Cleanup signing material - name: Cleanup keystore/config if: always() run: | From 4017250823a7358d4aad64cbeba9121cef425dcd Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 15:04:15 -0400 Subject: [PATCH 31/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 8f1cfb09..80950708 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -157,8 +157,8 @@ jobs: uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: chore: bump to ${NEW_NAME} (${NEW_CODE}) - title: chore: bump to ${NEW_NAME} (${NEW_CODE}) + commit-message: "chore: bump to ${NEW_NAME} (${NEW_CODE})" + title: "chore: bump to ${NEW_NAME} (${NEW_CODE})" body: | This PR bumps: - versionCode → ${NEW_CODE} From f35b6a5e5539409e609a1469945d67bbae38a6c4 Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 20:21:44 +0100 Subject: [PATCH 32/99] Update deploy system --- .github/workflows/bump-and-build.yml | 283 +++++++++++---------------- .github/workflows/deploy.yml | 45 +++++ 2 files changed, 155 insertions(+), 173 deletions(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index 80950708..b9108c46 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -1,13 +1,10 @@ -name: Bump + Release + F-Droid +name: Bump Version & Prepare F-Droid Release on: workflow_dispatch: - push: - tags: - - "v*" jobs: - release: + bump: runs-on: ubuntu-latest env: META_YML: fdroid/metadata/dev.octoshrimpy.quik.yml @@ -15,109 +12,92 @@ jobs: CHANGELOG: data/src/main/assets/changelog.json steps: - # 1) Checkout full history so tags are available - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - persist-credentials: true + - name: Checkout full history + uses: actions/checkout@v4 + with: + fetch-depth: 0 + persist-credentials: true - # 2) Decode your signing keystore from the secret - - name: Decode Android keystore - run: | - echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 + - name: Decode Android keystore + run: | + echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12 - # 3) Ensure your repo icon is in the right place - - name: Install repo icon - run: | - mkdir -p repo/icons/metadata/en-US/images - cp metadata/en-US/images/icon.png \ - repo/icons/metadata/en-US/images/icon.png + - name: Install repo icon + run: | + mkdir -p repo/icons/metadata/en-US/images + cp metadata/en-US/images/icon.png \ + repo/icons/metadata/en-US/images/icon.png - # 4) Write a lowercase-key F-Droid config.yml from secrets - - name: Write F-Droid config.yml - run: | - cat > config.yml < config.yml <> "$GITHUB_ENV" - echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" - echo "✅ Bumped to versionCode $new_code, versionName $new_name" - - # 9) Gather commits & prepend to changelog.json - - name: Update changelog.json & write F-Droid txt - shell: bash - run: | - set -euo pipefail - prev_tag="v${NEW_NAME}" - if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then - base="$prev_tag" - else - base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") - fi - [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" - mapfile -t commits < <( - git log --no-merges --reverse --pretty=format:"%s by %an" $range \ - | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ - | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//' \ - | awk '!seen[$0]++' - ) - if (( ${#commits[@]} )); then - changes_json=$(printf '%s\n' "${commits[@]}" | jq -R . | jq -s .) - else - changes_json="[]" - fi - jq --argjson changes "$changes_json" \ - --arg vc "$NEW_CODE" \ - --arg vn "$NEW_NAME" \ - ' + - name: Bump Android version & changelog + id: bump + shell: bash + run: | + set -euo pipefail + # extract current values + current_code=$(grep -E '^[[:space:]]*versionCode ' "$GRADLE_FILE" | awk '{print $2}') + current_name=$(grep -E 'versionName' "$GRADLE_FILE" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + # bump + new_code=$((current_code + 1)) + IFS='.' read -r major minor patch <<< "$current_name" + new_name="${major}.$((minor + 1)).0" + # apply to build.gradle + sed -i \ + -e "s|^[[:space:]]*versionCode[[:space:]]\+$current_code|versionCode $new_code|" \ + -e "s|versionName[[:space:]]\+'$current_name'|versionName '$new_name'|" \ + "$GRADLE_FILE" + echo "NEW_CODE=$new_code" >> "$GITHUB_ENV" + echo "NEW_NAME=$new_name" >> "$GITHUB_ENV" + # prepend to changelog.json + prev_tag="v${new_name}" + if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then + base="$prev_tag" + else + base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "") + fi + [[ -n "$base" ]] && range="$base..HEAD" || range="HEAD" + mapfile -t commits < <( + git log --no-merges --reverse --pretty=format:"%s by %an" $range \ + | sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \ + | sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' \ + | awk '!seen[$0]++' + ) + changes_json=$(printf '%s\n' "${commits[@]:-}" | jq -R . | jq -s .) + jq --argjson changes "$changes_json" \ + --arg vc "$new_code" \ + --arg vn "$new_name" \ + ' def capfirst: sub("^(.)"; "\(ascii_upcase(.1))"); $all := ($changes | map(capfirst)); $fixes := $all | map(select(test("^(Fix|fix)"))); @@ -128,77 +108,34 @@ jobs: fixes: $fixes, changes: $others }] + . - ' \ - "$CHANGELOG" > tmp && mv tmp "$CHANGELOG" - mkdir -p fdroid/metadata - out="fdroid/metadata/${NEW_CODE}.txt" - { - echo "Changes in ${NEW_NAME} (${NEW_CODE}):" - echo - for c in "${commits[@]}"; do echo "- $c"; done - } > "$out" + ' "$CHANGELOG" > tmp && mv tmp "$CHANGELOG" + # write F-Droid .txt summary + mkdir -p fdroid/metadata + { + echo "Changes in $new_name ($new_code):" + echo + for c in "${commits[@]}"; do echo "- $c"; done + } > fdroid/metadata/"${new_code}".txt + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add "$GRADLE_FILE" "$CHANGELOG" "fdroid/metadata/${new_code}.txt" + git commit -m "chore: bump to $new_name ($new_code)" - # 10) Commit version bump, changelog & metadata TXT - - name: Commit version bump & changelog - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${NEW_CODE}".txt - git diff --quiet --cached || git commit -m "chore: bump to ${NEW_NAME} (${NEW_CODE})" + - name: Push bump branch + run: | + git checkout -b bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} + git push --set-upstream origin bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} - # 11) Push bump branch instead of master - - name: Push bump branch - run: | - git checkout -b bump/${NEW_NAME}-${NEW_CODE} - git push --set-upstream origin bump/${NEW_NAME}-${NEW_CODE} - - # 12) Create & auto-merge PR - - name: Create & auto-merge PR - uses: peter-evans/create-pull-request@v5 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "chore: bump to ${NEW_NAME} (${NEW_CODE})" - title: "chore: bump to ${NEW_NAME} (${NEW_CODE})" - body: | - This PR bumps: - - versionCode → ${NEW_CODE} - - versionName → ${NEW_NAME} - branch: bump/${NEW_NAME}-${NEW_CODE} - base: master - labels: automated - merge-method: merge - auto-merge: true - - # 13) Build the APK (using the same keystore.p12) - - name: Build release APK - run: | - chmod +x ./gradlew - ./gradlew clean :presentation:assembleRelease \ - -Pandroid.injected.signing.store.file=keystore.p12 \ - -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ - -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ - -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} - - # 14) Tag & push tag (on master after auto-merge) - - name: Tag new release - run: | - git fetch origin master - git checkout master - git pull - git tag "v${NEW_NAME}" - git push origin "v${NEW_NAME}" - - # 15) Publish GitHub Release & upload APK - - name: Publish GitHub Release - uses: softprops/action-gh-release@v1 - with: - tag_name: "v${NEW_NAME}" - files: presentation/build/outputs/apk/release/*-release.apk - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - # 16) Cleanup signing material - - name: Cleanup keystore/config - if: always() - run: | - shred --remove keystore.p12 config.yml + - name: Open PR (no auto-merge) + uses: peter-evans/create-pull-request@v5 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + title: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})" + body: | + This PR bumps: + - versionCode → ${{ env.NEW_CODE }} + - versionName → ${{ env.NEW_NAME }} + branch: bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} + base: master + labels: automated diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 00000000..535ed788 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,45 @@ +name: Deploy APK from master + +on: + workflow_dispatch: + +jobs: + build-and-publish: + runs-on: ubuntu-latest + env: + GRADLE_FILE: presentation/build.gradle + + steps: + - name: Checkout master + uses: actions/checkout@v4 + with: + ref: master + fetch-depth: 0 + + - name: Set up Java 17 + uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: '17' + + - name: Decode Android keystore + run: echo "${{ secrets.KEYSTORE_FILE }}" \ + | base64 --decode > keystore.p12 + + - name: Build release APK + run: | + chmod +x ./gradlew + ./gradlew clean :presentation:assembleRelease \ + -Pandroid.injected.signing.store.file=keystore.p12 \ + -Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \ + -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ + -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} + + - name: Publish GitHub Release + uses: softprops/action-gh-release@v1 + with: + tag_name: "v$(grep versionName ${{ env.GRADLE_FILE }} \ + | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')" + files: presentation/build/outputs/apk/release/*-release.apk + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ef1a9809ffaa0be861e3b7808031a6c43b6a6bef Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 15:24:12 -0400 Subject: [PATCH 33/99] Update bump-and-build.yml --- .github/workflows/bump-and-build.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump-and-build.yml b/.github/workflows/bump-and-build.yml index b9108c46..a9ca87c9 100644 --- a/.github/workflows/bump-and-build.yml +++ b/.github/workflows/bump-and-build.yml @@ -120,11 +120,18 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add "$GRADLE_FILE" "$CHANGELOG" "fdroid/metadata/${new_code}.txt" git commit -m "chore: bump to $new_name ($new_code)" - + - name: Push bump branch run: | - git checkout -b bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} - git push --set-upstream origin bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }} + branch="bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}" + # Create or switch to the branch locally + if git rev-parse --verify "$branch" >/dev/null 2>&1; then + git checkout "$branch" + else + git checkout -b "$branch" + fi + # Force-push safely: only if the remote hasn't moved since last fetched + git push --force-with-lease origin HEAD:"$branch" - name: Open PR (no auto-merge) uses: peter-evans/create-pull-request@v5 From 2e4c8da9a8d33ff5210ef6696dbee92b8b3e053c Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 19:25:24 +0000 Subject: [PATCH 34/99] chore: bump to 4.2.0 (2230) --- config.yml | 5 + keystore.p12 | Bin 0 -> 4492 bytes repo/entry.jar | Bin 0 -> 1975 bytes repo/entry.json | 1 + repo/icons/icon.png | Bin 0 -> 72175 bytes repo/icons/metadata/en-US/images/icon.png | Bin 0 -> 72175 bytes repo/index-v1.jar | Bin 0 -> 2355 bytes repo/index-v1.json | 1 + repo/index-v2.json | 1 + repo/index.css | 228 ++++++++++++++++++++++ repo/index.html | 56 ++++++ repo/index.jar | Bin 0 -> 3302 bytes repo/index.png | Bin 0 -> 1128 bytes repo/index.xml | 1 + repo/status/running.json | 1 + repo/status/update.json | 1 + tmp/repo_1751138712000.json | 1 + 17 files changed, 296 insertions(+) create mode 100644 config.yml create mode 100644 keystore.p12 create mode 100644 repo/entry.jar create mode 100644 repo/entry.json create mode 100644 repo/icons/icon.png create mode 100644 repo/icons/metadata/en-US/images/icon.png create mode 100644 repo/index-v1.jar create mode 100644 repo/index-v1.json create mode 100644 repo/index-v2.json create mode 100644 repo/index.css create mode 100644 repo/index.html create mode 100644 repo/index.jar create mode 100644 repo/index.png create mode 100644 repo/index.xml create mode 100644 repo/status/running.json create mode 100644 repo/status/update.json create mode 100644 tmp/repo_1751138712000.json diff --git a/config.yml b/config.yml new file mode 100644 index 00000000..b065f90d --- /dev/null +++ b/config.yml @@ -0,0 +1,5 @@ +repo_keystore: keystore.p12 +keystorepass: ekaterina +repo_keyalias: quik_release +keypass: ekaterina +repo_icon: metadata/en-US/images/icon.png diff --git a/keystore.p12 b/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..07c99388b70ffb7564c250bd74d5aa3e8a12a833 GIT binary patch literal 4492 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 literal 0 HcmV?d00001 diff --git a/repo/entry.jar b/repo/entry.jar new file mode 100644 index 0000000000000000000000000000000000000000..9e978357c21bc10f483d621723ea06fb82db386c GIT binary patch literal 1975 zcmZ`)c{mhWAD%+yGN@#$B$8WWj4h+$Ge(VVjAa;#ZX?DzW9%fKB;EP4Mi?{+-CShf zv*p?<*DTg>k#&aDh!JAMo$8P7=jopFyyrZ>=RD_qe(&#(_q9d|2p$3e06@Uc)G@~p z3Yqn(+Y5=iV@p)6u*^q|N3p)Xf z<`n!jTj;O~?&|v{f!_f82!?))bv@WjBg-T2i6}y4=s-({XwmcIV(+U9+aZbT#@K~w zs*L$Mu}3;O4SFtxD2x4gA1L+bA9+=>y(kU)r~CJ#<6lH$wSHp7lYs%Fl*rGC(w}oT zPs=DMY{w=X#hE3X%M8GL*ZhDO>U)XXf6)ork5C>#c9 z0kt*$g@zElts#4Bs&O)MxZG#b5iwvCn>?&56q-B0DO!vw##fLK@ZzR}O!0@U*v=ekUXv=S;UloK7 z7zdeRstpOjNAfw|p$0YkYQ?Ywxs?&CEx`Y4RG2!Y3K0YV2tojW)DJacY!TX?E@+RL z0q+%09;5peqdF%>r;U$0G0DA26SvY6v~%gvnrWH8#w4e;-a3+-Hs$>Sq9j$v{0aP=*ZDHM%%p zD68BCq0LY)r9Q+JPo`z3I}&q_GYEJWXFT5B)18QSK6bLz7w_!t=}hw6D5Rx4*%yxX7a?jAMkj{X=8*T$7Zlg07X`9l}xl5Hj&_ zn<&;G6CF58!8enb*;;AfqHsO>S@unlhdxXl_}j3Y9A2WB)%j1MN0v)&c6u$k%o8d2 zYt@B40muyN(UI|uFpAbFfvcokvTc=dt;HvJDe_oc4>l^oOz;uM;pGDB`)=-?u|<~JL?x8)$64hrA4+5`}I6ahM;<< zJN{#Dv5CK8sN~8 z@>SLydQ?<6?k);${)mglUizK&_*dl}HxrbC45ciEa!h18e5JiZg;hx`Y1VA74%=pz z4TVQKUDD0_G&_q!zF2O2G?7H&)y7nmZT6lXxEI^0YV;&kt4|r&(bryCoQmsw z!y6oHmd2ng7ktZ|`oU_~2YeS(Ki@O|eWWGf_06Ey(6v-@9jN_$*gHpuBb^IFN{SOF zKn}Fbt@p1+pS2mpW#KN~8)s}bJEljZ&&5iKUd_{`c*PRkeeLcu(y0T_n-udu`#RM3 zHNdyYktw>wtj&p{3(lOW+kcjHr86SlxVHNchC7}KW+X`iR*DfUfHLVK!vqSkw$(#P zo`~M=Si9#=9+S`Zg*3XB)}C8nOeD(kLIZcUKNj-j<_4EmP23NfaJW3~Mp)?U3JBX~ zBO?1G_HzAX=xdL;a|dsDNsQweEfPJS>XTRdT7|lxFJa~WVfuEBI5rcqV`tOgq|vNc zf#&utSB}eJFT+$GWVUuHNvQi1;4@B*me!MR7Fs0gEX|?A@VQiCgza2qWw7LjO|VtB zV}FSAIBC7WX)4B{Nk5SWJ0RXyYp|i--W-vep5%Xt3?8az7OnfVp@Gobf6o|V9u~a*8B!^v~>D|yDWsg%P~u#C{=BUmb#9PDVP}? zTW(r?Mr8FV$Xv`^mnoqEL7g$HT3VK%i$LkLTA@rJzqdVm4+;ExM)8~cx}HRRxxOdX z*MDCk;9r8_+pjNYJ0CxaiQNplZTCAv{+=H(@J)C(#qQC5r`Wge9~A!>v^7eI{{jFA M^7jt^e*Cri8}7zpZ~y=R literal 0 HcmV?d00001 diff --git a/repo/entry.json b/repo/entry.json new file mode 100644 index 00000000..8b134780 --- /dev/null +++ b/repo/entry.json @@ -0,0 +1 @@ +{"timestamp": 1751138712000, "version": 20002, "index": {"name": "/index-v2.json", "sha256": "368eb849f97f8bd5ca4849e5e4b0498ecea417845bbee7cc7a1854f259761c14", "size": 620, "numPackages": 0}, "diffs": {}} \ No newline at end of file diff --git a/repo/icons/icon.png b/repo/icons/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..689d040b463cda3023f037b0e4660a34a64b2555 GIT binary patch literal 72175 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 p { + margin-top : 0; +} +#intro p:last-child { + margin-bottom : 0; +} +.last { + border-bottom : 1px solid black; + padding-bottom : .5em; + text-align : center; +} +table { + border-collapse : collapse; +} +h2 { + text-align : center; +} +.perms { + font-family : monospace; + font-size : .8em; +} +.repoapplist { + display : table; + border-collapse : collapse; + margin-left : auto; + margin-right : auto; + width : 600px; + max-width : 90%; +} +.approw, appdetailrow { + display : table-row; +} +.appdetailrow { + display : flex; + padding : .5em; +} +.appiconbig, .appdetailblock, .appdetailcell { + display : table-cell +} +.appiconbig { + vertical-align : middle; + text-align : center; +} +.appdetailinner { + width : 100%; +} +.applinkcell { + text-align : center; + float : right; + width : 100%; + margin-bottom : .1em; +} +.paddedlink { + margin : 1em; +} +.approw { + border-spacing : 1em; + border : 1px solid gray; + border-radius : 0.5em; + padding : 0.5em; + margin : 1.5em; +} +.appdetailinner .appdetailrow:first-child { + background-color : #d5d5d5; +} +.appdetailinner .appdetailrow:first-child .appdetailcell { + min-width : 33%; + flex : 1 33%; + text-align : center; +} +.appdetailinner .appdetailrow:first-child .appdetailcell:first-child { + text-align : left; +} +.appdetailinner .appdetailrow:first-child .appdetailcell:last-child { + float : none; + text-align : right; +} +.minor-details { + font-size : .8em; + color : #555555; +} +.boldname { + font-weight : bold; +} +#appcount { + text-align : center; + margin-bottom : .5em; +} +kbd { + padding : 0.1em 0.6em; + border : 1px solid #CCC; + background-color : #F7F7F7; + color : #333; + box-shadow : 0px 1px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 2px #FFF inset; + border-radius : 3px; + display : inline-block; + margin : 0px 0.1em; + text-shadow : 0px 1px 0px #FFF; + white-space : nowrap; +} +div.filterline, div.repoline { + display : table; + margin-left : auto; + margin-right : auto; + margin-bottom : 1em; + vertical-align : middle; + display : table; + font-size : .8em; +} +.filterline form { + display : table-row; +} +.filterline .filtercell { + display : table-cell; + vertical-align : middle; +} +fieldset { + float : left; +} +fieldset select, fieldset input, #reposelect select, #reposelect input { + font-size : .9em; +} +.pager { + display : table; + margin-left : auto; + margin-right : auto; + width : 600px; + max-width : 90%; + padding-top : .6em; +} +/* should correspond to .repoapplist */ +.pagerrow { + display : table-row; +} +.pagercell { + display : table-cell; +} +.pagercell.left { + text-align : left; + padding-right : 1em; +} +.pagercell.middle { + text-align : center; + font-size : .9em; + color : #555; +} +.pagercell.right { + text-align : right; + padding-left : 1em; +} +.anti { + color : peru; +} +.antibold { + color : crimson; +} +#footer { + text-align : center; + margin-top : 1em; + font-size : 11px; + color : #555; +} +#footer img { + vertical-align : middle; +} +@media (max-width: 600px) { + .repoapplist { + display : block; + } + .appdetailinner, .appdetailrow { + display : block; + } + .appdetailcell { + display : block; + float : left; + line-height : 1.5em; + } +} \ No newline at end of file diff --git a/repo/index.html b/repo/index.html new file mode 100644 index 00000000..d829f3de --- /dev/null +++ b/repo/index.html @@ -0,0 +1,56 @@ + + + + + + + + My First F-Droid Repo Demo + + + + + + + + + + + + +

+ My First F-Droid Repo Demo +

+
+

+ + + QR: test + + + This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid. +
+
+ Currently it serves + + 0 + + apps. To add it to your F-Droid app, scan the QR code (click it to enlarge) or use this link: +

+

+ + + https://MyFirstFDroidRepo.org/fdroid/repo + + +

+

+ If you would like to manually verify the fingerprint (SHA-256) of the repository signing key, here it is: +
+ + C5 49 A1 FE 45 7A 8D 8A 8B 3B 06 21 D4 80 EA 83 79 72 A0 BB 34 A7 1C 7A 0D E3 67 0F 6F 1A 1E F1 + +

+
+ + diff --git a/repo/index.jar b/repo/index.jar new file mode 100644 index 0000000000000000000000000000000000000000..bbcd9447c655ac4bc9fd175aa36090ff06647c56 GIT binary patch literal 3302 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 literal 0 HcmV?d00001 diff --git a/repo/index.png b/repo/index.png new file mode 100644 index 0000000000000000000000000000000000000000..1dce1567fb0c3731cb7f1689ff363db72b6fffa5 GIT binary patch literal 1128 zcmV-u1eg1XP) zO^V}45Jq2&3|>m$1JqIE8`P18Ia1$1I!Yg)L0TG8#4PgHRnrVe9z4chEKJGDM_Ld> zW_%IKGUtHJe;lDfxNzaZg$oxhT=-*gOLl^J*o=AD%&vghu$f)g6J`UznulH=H@on6 z!*O?aMt65#I**soIpfmBRKq8LaRJ6MWOR3*Ui#UEKO0}I32yElfc|Da(Yl^bK#YkG zon82Q;ivCkb#CL2OK{c!M&FFlw|^M-fZ2r$kG7gIf85NjeZa1OPwUyu2IA#^I=k?9 zz;g`i9asVS1!FzCv0fb3iyQsT9KZltUHPS-UHFsn+00^=I{rMR%mH$68-JeNuImY4 ziz)0wXBYlvc#L&T_?idI=b;1G%;y1f*3BFOejn+c{o{qdD4vy*1%S?Dsv6~!zTN=n z1MX#LZl8WKMg>xA#OCf3pC zFbBm6qw7K5%>`;;l-CL0XEk4SFA;7kNy7xxl)|U#gz`G!yRBvu?S8FyuW>EwCFH+) z*9t5Ah&8QEjSd&3l8~F6Jj6sI?(lr+luZafVt0y2mWA&{Rx7Y!xLCnc{{tP{T5TIb5qECsUK)wGb-+OqyiB^G|b+T5TI zjSk!v!}^lf_9erR*9qTkRXNG2YT2~)IS7(3v%|^jgdef=j@bMe@cH9ruwH^e7htvc zmV~noIBX|a&u;UuxIJWc;qQqz{dLW85)^?r^%9p2Uygs;*9kvh+0CFHb`lG(Uvk*G z!m5{8_%Xcc>Z~t-QL@zB&|doM$S0mC)(PKl$+?zVbA?(U%gSA7-pqErtt0#x-gb4C zecjzV5_iq(0PVP!ess2@0L`Guhou#(vc$NMEEg0Dku5ak}mjc;H;PMeQf6z zZ>*QR62J7b3x6`6(pRuQm(H0#QjtF;tpMY)SMwb;>6`Jz#d>?}>l+y7d$s!pY~)&Y7?0SpD+( zBb*FQSnBB=l#=kmDKO*VJFE&<#odM un)$zv`Mv4C*9jLcT)1%I!iE1|@V^1HEnA5LZ#nD$0000This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid. \ No newline at end of file diff --git a/repo/status/running.json b/repo/status/running.json new file mode 100644 index 00000000..785cb00a --- /dev/null +++ b/repo/status/running.json @@ -0,0 +1 @@ +{"/etc/issue.net":"Ubuntu 24.04.2 LTS","antiFeatures":{},"apksigner":"/usr/local/lib/android/sdk/build-tools/36.0.0/apksigner","archivePolicy0":[],"commandLine":["/opt/hostedtoolcache/Python/3.13.5/x64/bin/fdroid update"],"disabled":[],"endTimestamp":1751138715589,"failedBuilds":{},"fdroiddata":{"commitId":"ef1a9809ffaa0be861e3b7808031a6c43b6a6bef","isDirty":false,"modifiedFiles":[],"untrackedFiles":["config.yml","keystore.p12","repo/icons/metadata/en-US/images/icon.png"]},"jarsigner":"/usr/bin/jarsigner","keytool":"/usr/bin/keytool","needsUpdate":[],"noPackages":[],"noUpdateCheck":[],"stages":{"delete_disabled_builds":1751138712745,"index.make repo":1751138712749,"prepare_apps repo":1751138712747,"process_apks":1751138712746,"read_added_date_from_all_apks":1751138712747,"remove_apks":1751138712747,"scan_repo_files":1751138712746},"startTimestamp":1751138712000,"subcommand":"update"} \ No newline at end of file diff --git a/repo/status/update.json b/repo/status/update.json new file mode 100644 index 00000000..785cb00a --- /dev/null +++ b/repo/status/update.json @@ -0,0 +1 @@ +{"/etc/issue.net":"Ubuntu 24.04.2 LTS","antiFeatures":{},"apksigner":"/usr/local/lib/android/sdk/build-tools/36.0.0/apksigner","archivePolicy0":[],"commandLine":["/opt/hostedtoolcache/Python/3.13.5/x64/bin/fdroid update"],"disabled":[],"endTimestamp":1751138715589,"failedBuilds":{},"fdroiddata":{"commitId":"ef1a9809ffaa0be861e3b7808031a6c43b6a6bef","isDirty":false,"modifiedFiles":[],"untrackedFiles":["config.yml","keystore.p12","repo/icons/metadata/en-US/images/icon.png"]},"jarsigner":"/usr/bin/jarsigner","keytool":"/usr/bin/keytool","needsUpdate":[],"noPackages":[],"noUpdateCheck":[],"stages":{"delete_disabled_builds":1751138712745,"index.make repo":1751138712749,"prepare_apps repo":1751138712747,"process_apks":1751138712746,"read_added_date_from_all_apks":1751138712747,"remove_apks":1751138712747,"scan_repo_files":1751138712746},"startTimestamp":1751138712000,"subcommand":"update"} \ No newline at end of file diff --git a/tmp/repo_1751138712000.json b/tmp/repo_1751138712000.json new file mode 100644 index 00000000..7909e19b --- /dev/null +++ b/tmp/repo_1751138712000.json @@ -0,0 +1 @@ +{"repo": {"name": {"en-US": "My First F-Droid Repo Demo"}, "description": {"en-US": "This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/fdroid."}, "icon": {"en-US": {"name": "/icons/metadata/en-US/images/icon.png", "sha256": "f1b335114755dc09db369aa13ddf2b98063e0045c4a4c18e900d8b7646201c5d", "size": 72175}}, "address": "https://MyFirstFDroidRepo.org/fdroid/repo", "timestamp": 1751138712000}, "packages": {}} \ No newline at end of file From 406be900a8517d2a324f727d08b94996a74e9f2d Mon Sep 17 00:00:00 2001 From: octoshrimpy Date: Sat, 28 Jun 2025 15:27:35 -0400 Subject: [PATCH 35/99] Update deploy.yml --- .github/workflows/deploy.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 535ed788..a00237b1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,8 +23,9 @@ jobs: java-version: '17' - name: Decode Android keystore - run: echo "${{ secrets.KEYSTORE_FILE }}" \ - | base64 --decode > keystore.p12 + run: | + echo "${{ secrets.KEYSTORE_FILE }}" \ + | base64 --decode > keystore.p12 - name: Build release APK run: | @@ -35,11 +36,20 @@ jobs: -Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \ -Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }} + # ───────────────────────────────────────────────────────────────── + # 1) Extract versionName into an environment variable + - name: Extract versionName + id: extract + run: | + version=$(grep versionName $GRADLE_FILE \ + | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+') + echo "VERSION=$version" >> $GITHUB_ENV + + # 2) Publish using that VERSION - name: Publish GitHub Release uses: softprops/action-gh-release@v1 with: - tag_name: "v$(grep versionName ${{ env.GRADLE_FILE }} \ - | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')" + tag_name: v${{ env.VERSION }} files: presentation/build/outputs/apk/release/*-release.apk env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From aa64ffde3af2551277d3d9fdb562950e7ea3ad0e Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 28 Jun 2025 14:33:57 -0700 Subject: [PATCH 36/99] Fix archived toast's incorrect wording Previously it said that messages were archived when they actually were unarchived. The app no longer engages in this duplicity. --- .../main/java/com/moez/QKSMS/feature/main/MainActivity.kt | 8 ++++++-- .../src/main/java/com/moez/QKSMS/feature/main/MainView.kt | 2 +- .../java/com/moez/QKSMS/feature/main/MainViewModel.kt | 6 +++--- presentation/src/main/res/values/strings.xml | 4 ++++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index fed83338..51d6a22e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -440,10 +440,14 @@ class MainActivity : QkThemedActivity(), MainView { override fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) = changelogDialog.show(changelog) - override fun showArchivedSnackbar(countConversationsArchived: Int) = + override fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean) = Snackbar.make( drawerLayout, - resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived), + if (isArchiving) { + resources.getQuantityString(R.plurals.toast_archived, countConversationsArchived, countConversationsArchived) + } else { + resources.getQuantityString(R.plurals.toast_unarchived, countConversationsArchived, countConversationsArchived) + }, if (countConversationsArchived < 10) Snackbar.LENGTH_LONG else Snackbar.LENGTH_INDEFINITE ).let { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt index e33ca5b5..f489d7a2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainView.kt @@ -54,7 +54,7 @@ interface MainView : QkView { fun showDeleteDialog(conversations: List) fun showRenameDialog(conversationName: String) fun showChangelog(changelog: ChangelogManager.CumulativeChangelog) - fun showArchivedSnackbar(countConversationsArchived: Int) + fun showArchivedSnackbar(countConversationsArchived: Int, isArchiving: Boolean) fun drawerToggled(opened: Boolean) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 5da9edcf..f749f847 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -348,7 +348,7 @@ class MainViewModel @Inject constructor( .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> markArchived.execute(conversations) lastArchivedThreadIds = conversations.toList() - view.showArchivedSnackbar(lastArchivedThreadIds.count()) + view.showArchivedSnackbar(lastArchivedThreadIds.count(), true) view.clearSelection() } .autoDisposable(view.scope()) @@ -358,7 +358,7 @@ class MainViewModel @Inject constructor( .filter { itemId -> itemId == R.id.unarchive } .withLatestFrom(view.conversationsSelectedIntent) { _, conversations -> markUnarchived.execute(conversations.toList()) - view.showArchivedSnackbar(conversations.count()) + view.showArchivedSnackbar(conversations.count(), false) view.clearSelection() } .autoDisposable(view.scope()) @@ -523,7 +523,7 @@ class MainViewModel @Inject constructor( Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { lastArchivedThreadIds = listOf(threadId) - view.showArchivedSnackbar(1) + view.showArchivedSnackbar(1, true) } Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId)) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index fcf36f16..12a08a76 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -477,6 +477,10 @@ Archived conversation Archived %d conversations
+ + Unarchived conversation + Unarchived %d conversations + You must unlock QUIK+ to use this From 6029f56d04604ea62a362c1577a4df8f04fe5bb1 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 28 Jun 2025 15:46:24 -0700 Subject: [PATCH 37/99] Normalize numbers before comparing. When QUIK receives a message it compares to see if it goes into a new conversation or an existing. However, if the numbers are formatted differently, it will think that they are separate convos. Hopefully, normalizing before comparing will fix that. --- data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt index 474b779f..24b62caf 100644 --- a/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/PhoneNumberUtils.kt @@ -39,12 +39,14 @@ class PhoneNumberUtils @Inject constructor(context: Context) { * This method will run successfully stricter checks without compromising much speed */ fun compare(first: String, second: String): Boolean { - if (first.equals(second, true)) { + val normalizedFirst = normalizeNumber(first) + val normalizedSecond = normalizeNumber(second) + if (normalizedFirst.equals(normalizedSecond, true)) { return true } if (PhoneNumberUtils.compare(first, second)) { - val matchType = phoneNumberUtil.isNumberMatch(first, second) + val matchType = phoneNumberUtil.isNumberMatch(normalizedFirst, normalizedSecond) if (matchType >= PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) { return true } From 0a1ced673c596101628764e5784c96360711156c Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 28 Jun 2025 16:49:14 -0700 Subject: [PATCH 38/99] Remove unused github action files Let over from QKSMS --- .circleci/config.yml | 85 ------------------------------ .github/workflows/android.yml | 26 ---------- .travis.yml | 98 ----------------------------------- 3 files changed, 209 deletions(-) delete mode 100644 .circleci/config.yml delete mode 100644 .github/workflows/android.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index e824e3fa..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,85 +0,0 @@ -version: 2 - -jobs: - build: - working_directory: ~/code - docker: - - image: cimg/android:2022.12.1 - steps: - - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Download dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Decrypt and unzip secrets - command: | - openssl aes-256-cbc -d -in secrets.tar.enc -md sha1 -k ${SECRETS_KEY} -iv ${SECRETS_IV} >> secrets.tar - tar xvf secrets.tar - - run: - name: Gradle build - command: ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease - - run: - name: Flatten outputs - command: find presentation/build/outputs -mindepth 2 -type f -exec mv -i '{}' presentation/build/outputs/ ';' - - store_artifacts: - path: presentation/build/outputs - - persist_to_workspace: - root: presentation/build/outputs - paths: . - - test: - working_directory: ~/code - docker: - - image: cimg/android:2022.12.1 - steps: - - checkout - - restore_cache: - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - run: - name: Download dependencies - command: ./gradlew androidDependencies - - save_cache: - paths: - - ~/.gradle - key: jars-{{ checksum "build.gradle" }}-{{ checksum "presentation/build.gradle" }}-{{ checksum "data/build.gradle" }}-{{ checksum "domain/build.gradle" }} - - store_test_results: - path: presentation/build/test-results - - deploy: - docker: - - image: cibuilds/github:0.10 - steps: - - attach_workspace: - at: presentation/build/outputs - - run: - name: "Publish Release on GitHub" - command: ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} presentation/build/outputs/ - -workflows: - version: 2 - main: - jobs: - - build: - filters: - tags: - only: /^v.*/ - - test: - requires: - - build - filters: - tags: - only: /^v.*/ - - deploy: - requires: - - test - filters: - branches: - ignore: /.*/ - tags: - only: /^v.*/ diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml deleted file mode 100644 index e519f16f..00000000 --- a/.github/workflows/android.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Android CI - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: set up JDK 11 - uses: actions/setup-java@v3 - with: - java-version: '11' - distribution: 'temurin' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d94af70b..00000000 --- a/.travis.yml +++ /dev/null @@ -1,98 +0,0 @@ -language: android -jdk: oraclejdk8 -sudo: false - -notifications: - email: - on_success: change - on_failure: change - -env: - global: - - COMPILE_API_LEVEL=29 - - EMULATOR_API_LEVEL=24 # It seems emulator levels 25,26,27 from main repos have google_apis by default, and do not support armeabi-v7a. Check commit comment. - - EMULATOR_TAG=default # Possible values are default, google_apis, android-tv, android-wear, android-wear-cn - - EMULATOR_ABI=armeabi-v7a # Default is armeabi-v7a, possible options are: x86, x86_64, mips, arm64-v8a, armeabi-v7a. Note: check commit comment - - EMULATOR_NAME=quik4 - - ANDROID_BUILD_TOOLS_VERSION=29.0.2 # Match build-tools version used in build.gradle - - EMULATOR="system-images;android-${EMULATOR_API_LEVEL};${EMULATOR_TAG};${EMULATOR_ABI}" # Used to install/create emulator - -android: - components: - - tools - - platform-tools - - tools - - extra - - # The build tools used in the project - - build-tools-${ANDROID_BUILD_TOOLS_VERSION} - - # The SDK used in the project - - android-${COMPILE_API_LEVEL} - - # For running the emulator in Travis - - android-${EMULATOR_API_LEVEL} - - sys-img-${EMULATOR_ABI}-android-${EMULATOR_API_LEVEL} - -# Set up Android-sdk and the emulator -before_install: - # Decrypt keystore and google-services.json - - openssl aes-256-cbc -K $encrypted_4d1d940e2c65_key -iv $encrypted_4d1d940e2c65_iv -in secrets.tar.enc -out secrets.tar -d - - tar xvf secrets.tar - - - echo 'count=0' > /home/travis/.android/repositories.cfg # Avoid warning - - ls -lar $HOME/**/* - - # List and delete unnecessary components to free space - - sdkmanager --list || true # Print out package list for debug purposes - - sdkmanager --uninstall "extras;google;google_play_services" - - yes | sdkmanager "tools" # Update tools - - yes | sdkmanager "platforms;android-${EMULATOR_API_LEVEL}" # Android platform required by emulator - - yes | sdkmanager "platforms;android-${COMPILE_API_LEVEL}" # Android platform required by compiler - - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" # Android build tools - - yes | sdkmanager "${EMULATOR}" # Install emulator system image - - sdkmanager --list || true # Print out package list for debug purposes - -# Run the emulator -install: - # emulator instance - - echo no | android create avd --force -n ${EMULATOR_NAME} -k "${EMULATOR}" - # Run emulator in a subshell, this seems to solve the travis QT issue - - ( cd "$(dirname "$(which emulator)")" && ./emulator -avd ${EMULATOR_NAME} -verbose -show-kernel -selinux permissive -no-audio -no-window -no-boot-anim -wipe-data & ) - - android-wait-for-emulator - - adb shell settings put global window_animation_scale 0 & - - adb shell settings put global transition_animation_scale 0 & - - adb shell settings put global animator_duration_scale 0 & - - sleep 30 - - adb shell input keyevent 82 & - - adb devices - -# Gradle setup -before_script: - - cd ${TRAVIS_BUILD_DIR} - - ./gradlew --version - - ./gradlew clean - -# Build APK -script: - - | - ./gradlew :presentation:assembleWithAnalyticsRelease :presentation:bundleWithAnalyticsRelease assembleAndroidTest -PtestCoverageEnabled='true' - retval=$? - if [$retval -ne 0]; then - echo "error on assembling, exit code: "$retval - exit $retval - fi - -# Deploy APK -deploy: - provider: releases - skip_cleanup: true - overwrite: true - api_key: - secure: XF7V/I02gpyOzCAFXEFyrThXVUUnKjSaWQ8lppO50mVtdugimjWIPtHrcYASaJQf9INhqo0lamk+khPxtKxc1BSCp8o+c22UKcpczyjD4kK27a3zKfuNQWteBRjCH34vIGnrRFSHSWYLIgeuoIK3q5Lq4IBK/Od3mfpRaDt1ER+IqMzR3L205x1H8dW3MVuxXgdnq3jHlRpq86oOe293+dnblVCtWUvAzwhZPnnbBc4JUaNomMI7dLJ/pAigByCoHHmG9pc2Cky1yyWVAnTZFAlf2PbzPDLRRnXmHuYKfHxiZgd/l8JTiZdhky9cXgFoSxvJyDABRqqLxVNfXt2ZwgdtiulZml8RB1FB0L37qL72mxWgi6y9IbQgt/FG20K2QpSBglk0bCGLS+h5Yz3kV4fhsBY7llpWGw14BvlAx9sUfl3Ej+IUsWoJgA00TFNGDG8sMyOFoCQVz/sB4Dv4h+JfynJZcmm8okcfYrWBHOoHY7cH3chBWp/2A736f2A/aqnBd6z8a03toe2ILC9eSOiIhrVxPyqLmEKBD1rCduVFNteqGwm9G9YwKpvFibTqu0gqEtfF7cmuMH6M5PYExI5EzoewZTYmgp02+lBuFAEMvycVvXcu8VfeeT6cgeLlmz2hsbo93UfoSQyP+gSojMOOkVUsl6mIp1STLiJ5IRY= - file: - - /home/travis/build/octoshrimpy/quik/presentation/build/outputs/bundle/withAnalyticsRelease/presentation.aab - - /home/travis/build/octoshrimpy/quik/presentation/build/outputs/apk/withAnalytics/release/presentation-withAnalytics-release.apk - on: - repo: octoshrimpy/quik - tags: true \ No newline at end of file From 25d73d5e49b7035ab68f43eb506f285c3b8d7d5d Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 28 Jun 2025 16:44:18 -0700 Subject: [PATCH 39/99] Update auto-update-mms-configs.yml -Add automated label, and list files in download directory. -Set default branch as master in auto-update-mms. --- .github/workflows/auto-update-mms-configs.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-update-mms-configs.yml b/.github/workflows/auto-update-mms-configs.yml index 3083c5a2..cfea4035 100644 --- a/.github/workflows/auto-update-mms-configs.yml +++ b/.github/workflows/auto-update-mms-configs.yml @@ -8,8 +8,6 @@ on: jobs: vvm: runs-on: ubuntu-latest - env: - DEFAULT_BRANCH: auto-update-mms-configs steps: - name: Checkout repository @@ -35,6 +33,9 @@ jobs: - name: Download Messaging APK run: apkeep -a com.google.android.apps.messaging -o device=walleye /home/runner/work/quik/quik + - name: List files in directory + run: ls /home/runner/work/quik/quik + - name: Unzip the Messaging APK from XAPK run: | unzip /home/runner/work/quik/quik/com.google.android.apps.messaging.xapk -d /home/runner/work/quik/quik @@ -78,4 +79,5 @@ jobs: - Updated by [Auto-Update MMS configs] [Auto-Update MMS configs](./.github%2Fworkflows%2Fauto-update-mms-configs.yml) add-paths: android-smsmms/src/main/res/xml-mcc* branch: ${{ env.NEW_BRANCH }} - base: ${{ env.DEFAULT_BRANCH }} + base: master + labels: automated From 66f165cccf83e0576eccd5a7a01dc20984b66c63 Mon Sep 17 00:00:00 2001 From: peanut250 <209579534+peanut250@users.noreply.github.com> Date: Mon, 7 Jul 2025 15:30:12 -0500 Subject: [PATCH 40/99] message content filter feature initial implementation --- .../moez/QKSMS/migration/QkRealmMigration.kt | 13 +- .../QKSMS/repository/ContactRepositoryImpl.kt | 10 ++ .../MessageContentFilterRepositoryImpl.kt | 86 +++++++++++++ .../com/moez/QKSMS/interactor/ReceiveMms.kt | 12 +- .../com/moez/QKSMS/interactor/ReceiveSms.kt | 12 +- .../moez/QKSMS/model/MessageContentFilter.kt | 20 +++ .../QKSMS/repository/ContactRepository.kt | 2 + .../MessageContentFilterRepository.kt | 37 ++++++ .../feature/blocking/BlockingController.kt | 8 ++ .../feature/blocking/BlockingPresenter.kt | 4 + .../QKSMS/feature/blocking/BlockingView.kt | 2 + .../filters/MessageContentFiltersAdapter.kt | 55 +++++++++ .../MessageContentFiltersController.kt | 115 ++++++++++++++++++ .../filters/MessageContentFiltersPresenter.kt | 55 +++++++++ .../filters/MessageContentFiltersState.kt | 26 ++++ .../filters/MessageContentFiltersView.kt | 33 +++++ .../com/moez/QKSMS/injection/AppComponent.kt | 2 + .../com/moez/QKSMS/injection/AppModule.kt | 5 + .../main/res/layout/blocking_controller.xml | 6 + .../message_content_filter_list_item.xml | 72 +++++++++++ .../message_content_filters_add_dialog.xml | 74 +++++++++++ .../message_content_filters_controller.xml | 59 +++++++++ presentation/src/main/res/values/strings.xml | 10 ++ 23 files changed, 715 insertions(+), 3 deletions(-) create mode 100644 data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt create mode 100644 domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt create mode 100644 domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt create mode 100644 presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt create mode 100644 presentation/src/main/res/layout/message_content_filter_list_item.xml create mode 100644 presentation/src/main/res/layout/message_content_filters_add_dialog.xml create mode 100644 presentation/src/main/res/layout/message_content_filters_controller.xml diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 92e14040..7165b59c 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 11 + const val SchemaVersion: Long = 12 } @SuppressLint("ApplySharedPref") @@ -234,6 +234,17 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 11L) { + realm.schema.create("MessageContentFilter") + .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) + .addField("value", String::class.java, FieldAttribute.REQUIRED) + .addField("caseSensitive", Boolean::class.java, FieldAttribute.REQUIRED) + .addField("isRegex", Boolean::class.java, FieldAttribute.REQUIRED) + .addField("includeContacts", Boolean::class.java, FieldAttribute.REQUIRED) + + version++ + } + check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt index 2d48fbb0..ed70ecd1 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ContactRepositoryImpl.kt @@ -171,4 +171,14 @@ class ContactRepositoryImpl @Inject constructor( } } + override fun isContact(address: String): Boolean { + val uri : Uri + if (address.contains('@')) { + uri = Uri.withAppendedPath(Email.CONTENT_FILTER_URI, Uri.encode(address)) + } else { + uri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) + } + return context.contentResolver.query(uri, arrayOf(BaseColumns._ID), null, null, null)?.count!! > 0 + } + } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt new file mode 100644 index 00000000..869c5506 --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepositoryImpl.kt @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.MessageContentFilter +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.realm.Realm +import io.realm.RealmResults +import javax.inject.Inject + +class MessageContentFilterRepositoryImpl @Inject constructor() : MessageContentFilterRepository { + override fun createFilter(data: MessageContentFilterData) { + Realm.getDefaultInstance().use { realm -> + realm.refresh() + val maxId = realm.where(MessageContentFilter::class.java) + .max("id")?.toLong() ?: -1 + + realm.executeTransaction { + realm.insert(MessageContentFilter(maxId + 1, data.value, data.caseSensitive, data.isRegex, data.includeContacts)) + } + } + } + + override fun getMessageContentFilters(): RealmResults { + return Realm.getDefaultInstance() + .where(MessageContentFilter::class.java) + .findAllAsync() + } + + override fun getMessageContentFilter(id: Long): MessageContentFilter? { + return Realm.getDefaultInstance() + .where(MessageContentFilter::class.java) + .equalTo("id", id) + .findFirst() + } + + override fun isBlocked(messageBody: String, address: String, contactsRepo: ContactRepository): Boolean { + val isContact = contactsRepo.isContact(address) + + return Realm.getDefaultInstance().use { realm -> + realm.where(MessageContentFilter::class.java) + .findAll() + .any { filter -> + if (isContact && !filter.includeContacts) { + false + } else if (filter.isRegex) { + Regex(filter.value).matches(messageBody) + } else if (filter.caseSensitive) { + val regexp = ".*\\b" + Regex.escape(filter.value) + "\\b.*" + Regex(regexp).matches(messageBody) + } else { + val regexp = ".*\\b" + Regex.escape(filter.value.lowercase()) + "\\b.*" + Regex(regexp).matches(messageBody.lowercase()) + } + } + } + } + + override fun removeFilter(id: Long) { + Realm.getDefaultInstance().use { realm -> + realm.executeTransaction { + realm.where(MessageContentFilter::class.java) + .equalTo("id", id) + .findAll() + .deleteAllFromRealm() + } + } + } + +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt index 10a533f4..b3c01680 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveMms.kt @@ -23,7 +23,9 @@ import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.manager.ActiveConversationManager import dev.octoshrimpy.quik.manager.NotificationManager +import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences @@ -39,7 +41,9 @@ class ReceiveMms @Inject constructor( private val syncManager: SyncRepository, private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, - private val updateBadge: UpdateBadge + private val updateBadge: UpdateBadge, + private val filterRepo: MessageContentFilterRepository, + private val contactsRepo: ContactRepository ) : Interactor() { override fun buildObservable(params: Uri): Flowable<*> { @@ -75,6 +79,12 @@ class ReceiveMms @Inject constructor( else -> Unit } + if (filterRepo.isBlocked(message.getText(), message.address, contactsRepo)) { + Timber.v("message dropped based on content filters") + messageRepo.deleteMessages(listOf(message.id)) + return@mapNotNull null + } + message } .doOnNext { message -> diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt index 667dc268..d6837f9c 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/ReceiveSms.kt @@ -22,7 +22,9 @@ import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.extensions.mapNotNull import dev.octoshrimpy.quik.manager.NotificationManager import dev.octoshrimpy.quik.manager.ShortcutManager +import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.util.Preferences import io.reactivex.Flowable @@ -36,7 +38,9 @@ class ReceiveSms @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager, private val updateBadge: UpdateBadge, - private val shortcutManager: ShortcutManager + private val shortcutManager: ShortcutManager, + private val filterRepo: MessageContentFilterRepository, + private val contactsRepo: ContactRepository ) : Interactor() { override fun buildObservable(params: Long): Flowable<*> { @@ -69,6 +73,12 @@ class ReceiveSms @Inject constructor( } } + if (filterRepo.isBlocked(it.getText(), it.address, contactsRepo)) { + Timber.v("message dropped based on content filters") + messageRepo.deleteMessages(listOf(it.id)) + return@mapNotNull null + } + // update and fetch conversation conversationRepo.updateConversations(it.threadId) conversationRepo.getOrCreateConversation(it.threadId) diff --git a/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt b/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt new file mode 100644 index 00000000..c0560617 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/MessageContentFilter.kt @@ -0,0 +1,20 @@ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey + +open class MessageContentFilter( + @PrimaryKey var id: Long = 0, + + var value: String = "", + var caseSensitive: Boolean = false, + var isRegex: Boolean = false, + var includeContacts: Boolean = false +) : RealmObject() + +data class MessageContentFilterData( + var value: String = "", + var caseSensitive: Boolean = false, + var isRegex: Boolean = false, + var includeContacts: Boolean = false +) diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt index 88341465..446dbebb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ContactRepository.kt @@ -41,4 +41,6 @@ interface ContactRepository { fun setDefaultPhoneNumber(lookupKey: String, phoneNumberId: Long) + fun isContact(address: String): Boolean + } diff --git a/domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt new file mode 100644 index 00000000..031e89d9 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/repository/MessageContentFilterRepository.kt @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.MessageContentFilter +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.realm.RealmResults + +interface MessageContentFilterRepository { + + fun createFilter(data: MessageContentFilterData) + + fun getMessageContentFilters(): RealmResults + + fun getMessageContentFilter(id: Long): MessageContentFilter? + + fun isBlocked(messageBody: String, address: String, contactsRepo: ContactRepository): Boolean + + fun removeFilter(id: Long) + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt index e29f62ed..40bf0207 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingController.kt @@ -29,6 +29,7 @@ import dev.octoshrimpy.quik.common.util.extensions.animateLayoutChanges import dev.octoshrimpy.quik.feature.blocking.manager.BlockingManagerController import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController +import dev.octoshrimpy.quik.feature.blocking.filters.MessageContentFiltersController import dev.octoshrimpy.quik.injection.appComponent import kotlinx.android.synthetic.main.blocking_controller.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* @@ -38,6 +39,7 @@ class BlockingController : QkController { val blockingManagerIntent: Observable<*> val blockedNumbersIntent: Observable<*> + val messageContentFiltersIntent: Observable<*> val blockedMessagesIntent: Observable<*> val dropClickedIntent: Observable<*> fun openBlockingManager() fun openBlockedNumbers() + fun openMessageContentFilters() fun openBlockedMessages() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt new file mode 100644 index 00000000..f6b6818d --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.base.QkRealmAdapter +import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.model.MessageContentFilter +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.message_content_filter_list_item.* +import kotlinx.android.synthetic.main.message_content_filter_list_item.view.* + +class MessageContentFiltersAdapter : QkRealmAdapter() { + + val removeMessageContentFilter: Subject = PublishSubject.create() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.message_content_filter_list_item, parent, false) + return QkViewHolder(view).apply { + containerView.removeFilter.setOnClickListener { + val filter = getItem(adapterPosition) ?: return@setOnClickListener + removeMessageContentFilter.onNext(filter.id) + } + } + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val item = getItem(position)!! + holder.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE + holder.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE + holder.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE + holder.filter.text = item.value + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt new file mode 100644 index 00000000..61eb2079 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersController.kt @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import android.view.LayoutInflater +import android.view.View +import androidx.appcompat.app.AlertDialog +import com.jakewharton.rxbinding2.view.clicks +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.common.base.QkController +import dev.octoshrimpy.quik.common.util.Colors +import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint +import dev.octoshrimpy.quik.common.util.extensions.setTint +import dev.octoshrimpy.quik.common.widget.PreferenceView +import dev.octoshrimpy.quik.injection.appComponent +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.reactivex.Observable +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.message_content_filters_add_dialog.view.* +import kotlinx.android.synthetic.main.message_content_filters_controller.* +import kotlinx.android.synthetic.main.settings_switch_widget.view.* +import javax.inject.Inject + +class MessageContentFiltersController : QkController(), MessageContentFiltersView { + + @Inject override lateinit var presenter: MessageContentFiltersPresenter + @Inject lateinit var colors: Colors + + private val adapter = MessageContentFiltersAdapter() + private val saveFilterSubject: Subject = PublishSubject.create() + + init { + appComponent.inject(this) + retainViewMode = RetainViewMode.RETAIN_DETACH + layoutRes = R.layout.message_content_filters_controller + } + + override fun onAttach(view: View) { + super.onAttach(view) + presenter.bindIntents(this) + setTitle(R.string.message_content_filters_title) + showBackButton(true) + } + + override fun onViewCreated() { + super.onViewCreated() + add.setBackgroundTint(colors.theme().theme) + add.setTint(colors.theme().textPrimary) + adapter.emptyView = empty + filters.adapter = adapter + } + + override fun render(state: MessageContentFiltersState) { + adapter.updateData(state.filters) + } + + override fun removeFilter(): Observable = adapter.removeMessageContentFilter + override fun addFilter(): Observable<*> = add.clicks() + override fun saveFilter(): Observable = saveFilterSubject + + override fun showAddDialog() { + val layout = LayoutInflater.from(activity).inflate(R.layout.message_content_filters_add_dialog, null) + + (0 until layout.add_dialog.childCount) + .map { index -> layout.add_dialog.getChildAt(index) } + .mapNotNull { view -> view as? PreferenceView } + .map { preference -> preference.clicks().map { preference } } + .let { Observable.merge(it) } + .autoDisposable(scope()) + .subscribe { + it.checkbox.isChecked = !it.checkbox.isChecked + layout.caseSensitivity.isEnabled = !layout.regexp.checkbox.isChecked + } + + val dialog = AlertDialog.Builder(activity!!) + .setView(layout) + .setPositiveButton(R.string.message_content_filters_dialog_create) { _, _ -> + var text = layout.input.text.toString(); + if (!text.isBlank()) { + if (!layout.regexp.checkbox.isChecked) text = text.trim() + saveFilterSubject.onNext( + MessageContentFilterData( + text, + layout.caseSensitivity.checkbox.isChecked && !layout.regexp.checkbox.isChecked, + layout.regexp.checkbox.isChecked, + layout.contacts.checkbox.isChecked + ) + ) + } + } + .setNegativeButton(R.string.button_cancel) { _, _ -> } + dialog.show() + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt new file mode 100644 index 00000000..a4860f4a --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersPresenter.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.autoDisposable +import dev.octoshrimpy.quik.common.base.QkPresenter +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository +import io.reactivex.schedulers.Schedulers +import javax.inject.Inject + +class MessageContentFiltersPresenter @Inject constructor( + private val filterRepo: MessageContentFilterRepository, +) : QkPresenter( + MessageContentFiltersState(filters = filterRepo.getMessageContentFilters()) +) { + + override fun bindIntents(view: MessageContentFiltersView) { + super.bindIntents(view) + + view.removeFilter() + .observeOn(Schedulers.io()) + .doOnNext(filterRepo::removeFilter) + .subscribeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe() + + view.addFilter() + .autoDisposable(view.scope()) + .subscribe { view.showAddDialog() } + + view.saveFilter() + .observeOn(Schedulers.io()) + .subscribeOn(Schedulers.io()) + .autoDisposable(view.scope()) + .subscribe { filterData -> filterRepo.createFilter(filterData) } + } + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt new file mode 100644 index 00000000..a3c44663 --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersState.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import dev.octoshrimpy.quik.model.MessageContentFilter +import io.realm.RealmResults + +data class MessageContentFiltersState( + val filters: RealmResults? = null +) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt new file mode 100644 index 00000000..e3dda14b --- /dev/null +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersView.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.feature.blocking.filters + +import dev.octoshrimpy.quik.common.base.QkViewContract +import dev.octoshrimpy.quik.model.MessageContentFilterData +import io.reactivex.Observable + +interface MessageContentFiltersView : QkViewContract { + + fun removeFilter(): Observable + fun addFilter(): Observable<*> + fun saveFilter(): Observable + + fun showAddDialog() + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt index 2fe2a806..6c96873b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt @@ -32,6 +32,7 @@ import dev.octoshrimpy.quik.common.widget.QkTextView import dev.octoshrimpy.quik.common.widget.RadioPreferenceView import dev.octoshrimpy.quik.feature.backup.BackupController import dev.octoshrimpy.quik.feature.blocking.BlockingController +import dev.octoshrimpy.quik.feature.blocking.filters.MessageContentFiltersController import dev.octoshrimpy.quik.feature.blocking.manager.BlockingManagerController import dev.octoshrimpy.quik.feature.blocking.messages.BlockedMessagesController import dev.octoshrimpy.quik.feature.blocking.numbers.BlockedNumbersController @@ -65,6 +66,7 @@ interface AppComponent { fun inject(controller: BackupController) fun inject(controller: BlockedMessagesController) fun inject(controller: BlockedNumbersController) + fun inject(controller: MessageContentFiltersController) fun inject(controller: BlockingController) fun inject(controller: BlockingManagerController) fun inject(controller: SettingsController) diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index 84cc8b71..8a1d35b2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -81,6 +81,8 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ContactRepositoryImpl import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.ConversationRepositoryImpl +import dev.octoshrimpy.quik.repository.MessageContentFilterRepository +import dev.octoshrimpy.quik.repository.MessageContentFilterRepositoryImpl import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.MessageRepositoryImpl import dev.octoshrimpy.quik.repository.ScheduledMessageRepository @@ -199,6 +201,9 @@ class AppModule(private var application: Application) { @Provides fun provideBlockingRepository(repository: BlockingRepositoryImpl): BlockingRepository = repository + @Provides + fun provideMessageContentFilterRepository(repository: MessageContentFilterRepositoryImpl): MessageContentFilterRepository = repository + @Provides fun provideContactRepository(repository: ContactRepositoryImpl): ContactRepository = repository diff --git a/presentation/src/main/res/layout/blocking_controller.xml b/presentation/src/main/res/layout/blocking_controller.xml index 24812b76..ef796e76 100644 --- a/presentation/src/main/res/layout/blocking_controller.xml +++ b/presentation/src/main/res/layout/blocking_controller.xml @@ -46,6 +46,12 @@ android:layout_height="wrap_content" app:title="@string/blocked_numbers_title" /> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/message_content_filters_add_dialog.xml b/presentation/src/main/res/layout/message_content_filters_add_dialog.xml new file mode 100644 index 00000000..90394f2e --- /dev/null +++ b/presentation/src/main/res/layout/message_content_filters_add_dialog.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + diff --git a/presentation/src/main/res/layout/message_content_filters_controller.xml b/presentation/src/main/res/layout/message_content_filters_controller.xml new file mode 100644 index 00000000..e294eb09 --- /dev/null +++ b/presentation/src/main/res/layout/message_content_filters_controller.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index fcf36f16..ea0d5397 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -360,6 +360,16 @@ Phone number Block + Message content filters + Your message content filters will appear here + Create a new filter + Drop messages matching + Word, phrase or regular expression + Case sensitive + Regular expression + Include contacts + Create + Blocked messages Your blocked messages will appear here From 27b102da3615ecefaa0e9c7fdc5faafae9319de6 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Thu, 3 Jul 2025 16:09:17 -0700 Subject: [PATCH 41/99] Fix deleting scheduled messages The message id's were not getting passed to the delete interactor, rather the number of messages were being passed. This fixes that by passing the id's to the deleteScheduledMessagesInteractor. --- .../com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index 035c414c..abc62823 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -52,7 +52,11 @@ class ScheduledViewModel @Inject constructor( .filter { it == R.id.delete } .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages } .autoDisposable(view.scope()) - .subscribe { view.showDeleteDialog(it) } + .subscribe { + val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage).map { it.id } + view.showDeleteDialog(ids) + } + // copy the selected message text to the clipboard view.optionsItemIntent From e8c92a14224be05829dce3326e088e53c01a4a8a Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 7 Jul 2025 16:13:36 -0700 Subject: [PATCH 42/99] Show scheduled send icon when scheduling a message. --- .../moez/QKSMS/feature/compose/ComposeActivity.kt | 8 +++++--- .../QKSMS/feature/compose/ComposeViewModel.kt | 3 ++- .../src/main/res/layout/compose_activity.xml | 15 +++++++++++++++ presentation/src/main/res/values/strings.xml | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 9c07846f..c3caa97a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -124,6 +124,7 @@ import kotlinx.android.synthetic.main.compose_activity.scheduleLabel import kotlinx.android.synthetic.main.compose_activity.scheduledCancel import kotlinx.android.synthetic.main.compose_activity.scheduledGroup import kotlinx.android.synthetic.main.compose_activity.scheduledTime +import kotlinx.android.synthetic.main.compose_activity.scheduledSend import kotlinx.android.synthetic.main.compose_activity.send import kotlinx.android.synthetic.main.compose_activity.sendAsGroup import kotlinx.android.synthetic.main.compose_activity.sendAsGroupBackground @@ -182,7 +183,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val scheduleSelectedIntent: Subject = PublishSubject.create() override val changeSimIntent by lazy { sim.clicks() } override val scheduleCancelIntent by lazy { scheduledCancel.clicks() } - override val sendIntent by lazy { send.clicks() } + override val sendIntent by lazy { Observable.merge(send.clicks(), scheduledSend.clicks()) } override val viewQksmsPlusIntent: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() override val confirmDeleteIntent: Subject> = PublishSubject.create() @@ -532,9 +533,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName) simIndex.text = state.subscription?.simSlotIndex?.plus(1)?.toString() - // show either send or audio msg record button - send.visibility = if (state.canSend && !state.loading) View.VISIBLE else View.INVISIBLE + // show either send, audio msg record, or sendScheduled button + send.visibility = if (state.canSend && !state.loading && state.scheduled == 0L) View.VISIBLE else View.INVISIBLE recordAudioMsg.visibility = if (state.canSend && !state.loading) View.INVISIBLE else View.VISIBLE + scheduledSend.visibility = if (state.canSend && (state.scheduled != 0L) && !state.loading) View.VISIBLE else View.INVISIBLE // if not in editing mode, and there are no non-me participants that can be sent to, // hide controls that allow constructing a reply and inform user no valid recipients diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 572bd434..64077b07 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -834,7 +834,8 @@ class ComposeViewModel @Inject constructor( .subscribe { newState { copy( - canSend = (it.first.isNotBlank() || (it.second > 0)) || (it.third > 0) + canSend = (it.first.isNotBlank() || (it.second > 0)), + scheduled = it.third ) } } diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 0fb27f70..0c1a5b1c 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -347,6 +347,21 @@ app:tint="?android:textColorSecondary" tools:visibility="visible" /> + + Sending on December 23rd  Schedule a message + Schedule this message Scheduled message Missing From 56a767bbd71e5e3acb850f9c1e0bf7b5ff3af37e Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Tue, 8 Jul 2025 16:26:03 -0700 Subject: [PATCH 43/99] Clean up Scheduling Code Update documentation, remove deprecated and unused code, and clean up formatting. --- .../ScheduledMessageRepositoryImpl.kt | 14 +++++--------- .../QKSMS/interactor/AddScheduledMessage.kt | 6 ++---- .../QKSMS/interactor/DeleteScheduledMessages.kt | 8 +++++--- .../repository/ScheduledMessageRepository.kt | 13 ++++++++++--- .../feature/scheduled/ScheduledActivity.kt | 6 ++++-- .../scheduled/ScheduledMessageAdapter.kt | 9 ++++----- .../ScheduledMessageAttachmentAdapter.kt | 1 - .../feature/scheduled/ScheduledViewModel.kt | 17 +++++++++++------ 8 files changed, 41 insertions(+), 33 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt index d0db5030..8892afe2 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt @@ -8,6 +8,7 @@ import io.reactivex.schedulers.Schedulers import io.realm.Realm import io.realm.RealmList import io.realm.RealmResults +import timber.log.Timber import javax.inject.Inject class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRepository { @@ -71,12 +72,12 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep realm.executeTransaction { message?.deleteFromRealm() } } - }.subscribeOn(Schedulers.io()) // Perform the operation in a background thread - .observeOn(AndroidSchedulers.mainThread()) // Switch back to the main thread if needed + }.subscribeOn(Schedulers.io()) // Run on a background thread and switch to main if needed + .observeOn(AndroidSchedulers.mainThread()) .subscribe({ - // Handle completion, e.g., log success or update UI + Timber.v("Successfully deleted scheduled messages.") }, { - // Handle error, e.g., log or show error message + Timber.e("Deleting scheduled messages failed.") }) disposables.add(subscription) @@ -96,9 +97,4 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep .map { it.id } } } - - // Ensure to clear disposables when the repository is no longer needed - fun clearDisposables() { - disposables.clear() - } } diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index 54096873..a4fe3c5f 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt @@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.interactor import android.annotation.SuppressLint import android.content.Context -import android.net.Uri import androidx.core.net.toUri import dev.octoshrimpy.quik.extensions.getName import dev.octoshrimpy.quik.repository.ScheduledMessageRepository @@ -58,7 +57,7 @@ class AddScheduledMessage @Inject constructor( // step 2 - copy attachments to app local storage scheduledMessageDb.attachments = RealmList( *scheduledMessageDb.attachments.mapNotNull { - val inUri = Uri.parse(it) + val inUri = it.toUri() try { // get filename of input uri or use random uuid on fail to get val filename = inUri.getName(context) ?: UUID.randomUUID() @@ -93,5 +92,4 @@ class AddScheduledMessage @Inject constructor( } .flatMap { updateScheduledMessageAlarms.buildObservable(Unit) } } - -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt index d1aa4c23..535efdae 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/DeleteScheduledMessages.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.content.Context import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import io.reactivex.Flowable +import timber.log.Timber import java.io.File import javax.inject.Inject @@ -41,11 +42,12 @@ class DeleteScheduledMessages @Inject constructor( val topDir = File(context.filesDir, "scheduled-${it}") topDir.exists() && topDir.deleteRecursively() } - } catch (e: Exception) { /* nothing */ } + } catch (e: Exception) { + Timber.e("Unable to delete scheduled messages.") + } // delete the db entries scheduledMessageRepo.deleteScheduledMessages(it) } } - -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt index e210bd57..386faebc 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt @@ -35,6 +35,9 @@ interface ScheduledMessageRepository { attachments: List ): ScheduledMessage + /** + * Updates scheduled messages with new uris + */ fun updateScheduledMessage(scheduledMessage: ScheduledMessage) /** @@ -52,10 +55,14 @@ interface ScheduledMessageRepository { */ fun deleteScheduledMessage(id: Long) - // delete multiple scheduled messages by id list + /** + * Delete multiple scheduled messages by id list + */ fun deleteScheduledMessages(ids: List) - // get a list of all scheduled message ids (in scheduled date order) + /** + * Get a list of all scheduled message ids (in scheduled date order) + */ fun getAllScheduledMessageIdsSnapshot(): List -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 73aaa7df..a09be06e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -51,7 +51,9 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override val editScheduledMessage: Subject = PublishSubject.create() override val backPressedIntent: Subject = PublishSubject.create() - private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] } + private val viewModel by lazy { + ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] + } override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) @@ -152,4 +154,4 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { finish() } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt index f42f6a66..eb522a95 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt @@ -53,7 +53,8 @@ class ScheduledMessageAdapter @Inject constructor( val clicks: Subject = PublishSubject.create() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false) + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.scheduled_message_list_item, parent, false) view.attachments.adapter = ScheduledMessageAttachmentAdapter(context) view.attachments.setRecycledViewPool(imagesViewPool) @@ -76,7 +77,8 @@ class ScheduledMessageAdapter @Inject constructor( val message = getItem(position) ?: return // GroupAvatarView only accepts recipients, so map the phone numbers to recipients - holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) } + holder.avatars.recipients = + message.recipients.map { address -> Recipient(address = address) } holder.recipients.text = message.recipients.joinToString(",") { address -> contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address @@ -111,10 +113,7 @@ class ScheduledMessageAdapter @Inject constructor( } }) } - return super.get(key)?.takeIf { it.isValid } } - } - } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt index 4e181c98..147cd7e4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt @@ -65,5 +65,4 @@ class ScheduledMessageAttachmentAdapter @Inject constructor( else -> holder.fileName.visibility = View.GONE } } - } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index abc62823..d2608ec9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -50,10 +50,12 @@ class ScheduledViewModel @Inject constructor( // show the delete message dialog if one or more messages selected view.optionsItemIntent .filter { it == R.id.delete } - .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages } + .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> + selectedMessages } .autoDisposable(view.scope()) .subscribe { - val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage).map { it.id } + val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage) + .map { it.id } view.showDeleteDialog(ids) } @@ -61,7 +63,8 @@ class ScheduledViewModel @Inject constructor( // copy the selected message text to the clipboard view.optionsItemIntent .filter { it == R.id.copy } - .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages } + .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> + selectedMessages } .autoDisposable(view.scope()) .subscribe { val messages = it @@ -82,14 +85,16 @@ class ScheduledViewModel @Inject constructor( // send the messages now menu item selected view.optionsItemIntent .filter { it == R.id.send_now } - .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages } + .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> + selectedMessages } .autoDisposable(view.scope()) .subscribe { view.showSendNowDialog(it) } // edit message menu item selected view.optionsItemIntent .filter { it == R.id.edit_message } - .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> selectedMessage.first() } + .withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> + selectedMessage.first() } .autoDisposable(view.scope()) .subscribe { view.showEditMessageDialog(it) } @@ -130,7 +135,7 @@ class ScheduledViewModel @Inject constructor( // navigate back or unselect view.optionsItemIntent .filter { it == android.R.id.home } - .map { Unit } + .map { } .mergeWith(view.backPressedIntent) .withLatestFrom(state) { _, state -> state } .autoDisposable(view.scope()) From 3d7526512d4e9c744bfe3d6919bdf2babf5e4187 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Tue, 8 Jul 2025 18:22:07 -0700 Subject: [PATCH 44/99] Indicate in UI when scheduled messages are present Added a new property to scheduled messages to save which conversation the scheduled message belongs to. --- .../moez/QKSMS/migration/QkRealmMigration.kt | 10 +++++- .../ScheduledMessageRepositoryImpl.kt | 12 +++++-- .../QKSMS/interactor/AddScheduledMessage.kt | 11 +++++-- .../com/moez/QKSMS/model/ScheduledMessage.kt | 8 +++-- .../repository/ScheduledMessageRepository.kt | 10 +++++- .../java/com/moez/QKSMS/common/Navigator.kt | 3 +- .../QKSMS/feature/compose/ComposeActivity.kt | 2 ++ .../QKSMS/feature/compose/ComposeState.kt | 1 + .../QKSMS/feature/compose/ComposeViewModel.kt | 33 +++++++++++++++++-- .../conversations/ConversationsAdapter.kt | 21 ++++++++++++ .../moez/QKSMS/feature/main/MainViewModel.kt | 2 +- .../moez/QKSMS/feature/plus/PlusViewModel.kt | 2 +- .../feature/scheduled/ScheduledActivity.kt | 2 +- .../scheduled/ScheduledActivityModule.kt | 8 ++++- .../QKSMS/feature/scheduled/ScheduledState.kt | 1 + .../feature/scheduled/ScheduledViewModel.kt | 14 +++++++- .../res/layout/conversation_list_item.xml | 16 ++++++++- presentation/src/main/res/menu/compose.xml | 7 ++++ presentation/src/main/res/values/strings.xml | 1 + 19 files changed, 146 insertions(+), 18 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 92e14040..ddeece80 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 11 + const val SchemaVersion: Long = 12 } @SuppressLint("ApplySharedPref") @@ -233,6 +233,14 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 11L) { + realm.schema.get("ScheduledMessage") + ?.addField("conversationId", Long::class.java, FieldAttribute.REQUIRED) + // Because there was never any property associated with which conversation/recipients a scheduled message was for, + // we can't update this field on a realm migration. It will be set to a default of 0 + + version++ + } check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt index 8892afe2..774efeaf 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepositoryImpl.kt @@ -21,7 +21,8 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep recipients: List, sendAsGroup: Boolean, body: String, - attachments: List + attachments: List, + conversationId: Long ): ScheduledMessage { Realm.getDefaultInstance().use { realm -> val id = (realm @@ -34,7 +35,7 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep val attachmentsRealmList = RealmList(*attachments.toTypedArray()) val message = ScheduledMessage(id, date, subId, recipientsRealmList, sendAsGroup, body, - attachmentsRealmList) + attachmentsRealmList, conversationId) realm.executeTransaction { realm.insertOrUpdate(message) } @@ -63,6 +64,13 @@ class ScheduledMessageRepositoryImpl @Inject constructor() : ScheduledMessageRep .findFirst() } + override fun getScheduledMessagesForConversation(conversationId: Long): RealmResults { + return Realm.getDefaultInstance() + .where(ScheduledMessage::class.java) + .equalTo("conversationId", conversationId) + .findAllAsync() + } + override fun deleteScheduledMessage(id: Long) { val subscription = Completable.fromAction { Realm.getDefaultInstance().use { realm -> diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt index a4fe3c5f..89762b8c 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/AddScheduledMessage.kt @@ -41,7 +41,8 @@ class AddScheduledMessage @Inject constructor( val recipients: List, val sendAsGroup: Boolean, val body: String, - val attachments: List + val attachments: List, + val conversationId: Long ) @SuppressLint("Range") @@ -50,7 +51,13 @@ class AddScheduledMessage @Inject constructor( return Flowable.just(params) .map { // step 1 - save, as-is, to db to get primary key id scheduledMessageRepo.saveScheduledMessage( - it.date, it.subId, it.recipients, it.sendAsGroup, it.body, it.attachments + it.date, + it.subId, + it.recipients, + it.sendAsGroup, + it.body, + it.attachments, + it.conversationId ) } .map { scheduledMessageDb -> diff --git a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt index a49c486b..09f586a1 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/ScheduledMessage.kt @@ -29,7 +29,8 @@ open class ScheduledMessage( var recipients: RealmList = RealmList(), var sendAsGroup: Boolean = true, var body: String = "", - var attachments: RealmList = RealmList() + var attachments: RealmList = RealmList(), + var conversationId: Long = 0 ) : RealmObject() { fun copy( @@ -39,10 +40,11 @@ open class ScheduledMessage( recipients: RealmList = this.recipients, sendAsGroup: Boolean = this.sendAsGroup, body: String = this.body, - attachments: RealmList = this.attachments + attachments: RealmList = this.attachments, + conversationId: Long = this.conversationId ): ScheduledMessage { - return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments) + return ScheduledMessage(id, date, subId, recipients, sendAsGroup, body, attachments, conversationId) } } \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt index 386faebc..53a0c2eb 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/ScheduledMessageRepository.kt @@ -18,7 +18,9 @@ */ package dev.octoshrimpy.quik.repository +import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.ScheduledMessage +import io.realm.RealmList import io.realm.RealmResults interface ScheduledMessageRepository { @@ -32,7 +34,8 @@ interface ScheduledMessageRepository { recipients: List, sendAsGroup: Boolean, body: String, - attachments: List + attachments: List, + conversationId: Long ): ScheduledMessage /** @@ -50,6 +53,11 @@ interface ScheduledMessageRepository { */ fun getScheduledMessage(id: Long): ScheduledMessage? + /** + * Returns all scheduled messages with the given [conversationId] + */ + fun getScheduledMessagesForConversation(conversationId: Long): RealmResults + /** * Deletes the scheduled message with the given [id] */ diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index 775c2810..d867e794 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -160,8 +160,9 @@ class Navigator @Inject constructor( startActivity(Intent(context, BackupActivity::class.java)) } - fun showScheduled() { + fun showScheduled(conversationId: Long?) { val intent = Intent(context, ScheduledActivity::class.java) + conversationId?.let { intent.putExtra("conversationId", it) } startActivity(intent) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index c3caa97a..36a15b28 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -469,6 +469,8 @@ class ComposeActivity : QkThemedActivity(), ComposeView { // Don't set the adapters unless needed if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter + toolbar.menu.findItem(R.id.viewScheduledMessages)?.isVisible = !state.editingMode && state.selectedMessages == 0 + && state.query.isEmpty() && state.hasScheduledMessages toolbar.menu.findItem(R.id.select_all)?.isVisible = !state.editingMode && (messageAdapter.itemCount > 1) && state.selectedMessages != 0 toolbar.menu.findItem(R.id.add)?.isVisible = state.editingMode toolbar.menu.findItem(R.id.call)?.isVisible = !state.editingMode && state.selectedMessages == 0 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt index ebd448fa..81b5bd05 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeState.kt @@ -47,6 +47,7 @@ data class ComposeState( val remaining: String = "", val subscription: SubscriptionInfoCompat? = null, val canSend: Boolean = false, + val hasScheduledMessages: Boolean = false, val validRecipientNumbers: Int = 1, val audioMsgRecording: Boolean = false, val saveDraft: Boolean = true, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 64077b07..b8a91763 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -72,6 +72,7 @@ import dev.octoshrimpy.quik.model.getText import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository +import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.util.ActiveSubscriptionObservable import dev.octoshrimpy.quik.util.FileUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils @@ -114,6 +115,7 @@ class ComposeViewModel @Inject constructor( private val markRead: MarkRead, private val messageDetailsFormatter: MessageDetailsFormatter, private val messageRepo: MessageRepository, + private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val permissionManager: PermissionManager, private val phoneNumberUtils: PhoneNumberUtils, @@ -265,6 +267,22 @@ class ComposeViewModel @Inject constructor( newState { copy(subscription = sub) } }.subscribe() + // checks if there are any scheduled messages in convo + disposables += conversation + .distinctUntilChanged { conversation -> conversation.id } + .observeOn(AndroidSchedulers.mainThread()) + .switchMap { conversation -> + scheduledMessageRepo + .getScheduledMessagesForConversation(conversation.id) + .asFlowable() + .toObservable() + } + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { liveResults -> + val hasAny = liveResults.isNotEmpty() + newState { copy(hasScheduledMessages = hasAny) } + } + // actions if (mode == "scheduling") newState { copy(scheduling = true) } @@ -338,6 +356,15 @@ class ComposeViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { newState { copy() } } + // Show scheduled messages + view.optionsItemIntent + .filter {it == R.id.viewScheduledMessages} + .withLatestFrom(state, conversation) + .autoDisposable(view.scope()) + .subscribe { (_, _, conversation) -> + navigator.showScheduled(conversation.id) + } + // toggle select all / select none view.optionsItemIntent .filter { it == R.id.select_all } @@ -1099,6 +1126,7 @@ class ComposeViewModel @Inject constructor( } val subId = state.subscription?.subscriptionId ?: -1 + val conversationId = (conversation.id) val addresses = when (conversation.recipients.isNotEmpty()) { true -> conversation.recipients.map { it.address } false -> chips.map { chip -> chip.address } @@ -1116,10 +1144,11 @@ class ComposeViewModel @Inject constructor( addresses, sendAsGroup, body.toString(), - state.attachments.map { it.uri.toString() } + state.attachments.map { it.uri.toString() }, + conversationId ) ).also { - newState { copy(scheduled = 0) } + newState { copy(scheduled = 0, hasScheduledMessages = true ) } showScheduledToast = true } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index ec51803f..fae962d1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -24,6 +24,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.core.text.buildSpannedString import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkRealmAdapter @@ -33,7 +34,9 @@ import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setTint import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.repository.ScheduledMessageRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils +import io.reactivex.disposables.CompositeDisposable import kotlinx.android.synthetic.main.conversation_list_item.* import kotlinx.android.synthetic.main.conversation_list_item.view.* import javax.inject.Inject @@ -42,9 +45,11 @@ class ConversationsAdapter @Inject constructor( private val colors: Colors, private val context: Context, private val dateFormatter: DateFormatter, + private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val phoneNumberUtils: PhoneNumberUtils ) : QkRealmAdapter() { + private val disposables = CompositeDisposable() init { // This is how we access the threadId for the swipe actions @@ -117,6 +122,16 @@ class ConversationsAdapter @Inject constructor( // Make the preview in italics if draft if (conversation.draft.isNotEmpty()) holder.snippet.setTypeface(null, Typeface.ITALIC) + // Get Scheduled Messages + val disposable = scheduledMessageRepo + .getScheduledMessagesForConversation(conversation.id) + .asFlowable() + .toObservable() + .subscribe { messages -> + holder.scheduled.isVisible = messages.isNotEmpty() + } + disposables.add(disposable) + holder.pinned.isVisible = conversation.pinned holder.unread.setTint(theme) } @@ -129,4 +144,10 @@ class ConversationsAdapter @Inject constructor( return if (getItem(position)?.unread == false) 0 else 1 } + override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { + super.onDetachedFromRecyclerView(recyclerView) + disposables.clear() + } + + } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 5da9edcf..5407b85e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -317,7 +317,7 @@ class MainViewModel @Inject constructor( else -> newState { copy(hasError = true) } } NavItem.BACKUP -> navigator.showBackup() - NavItem.SCHEDULED -> navigator.showScheduled() + NavItem.SCHEDULED -> navigator.showScheduled(null) NavItem.BLOCKING -> navigator.showBlockedConversations() NavItem.SETTINGS -> navigator.showSettings() // NavItem.PLUS -> navigator.showQksmsPlusActivity("main_menu") diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt index ced17068..8f84e6cc 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusViewModel.kt @@ -66,7 +66,7 @@ class PlusViewModel @Inject constructor( view.scheduleClicks .autoDisposable(view.scope()) - .subscribe { navigator.showScheduled() } + .subscribe { navigator.showScheduled(null) } view.backupClicks .autoDisposable(view.scope()) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index a09be06e..5be1d40e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -99,7 +99,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { ((scheduledMessageAdapter.itemCount != 0) && (state.selectedMessages == 1)) // show compose button - compose.isVisible = state.upgraded + compose.isVisible = state.upgraded && (state.conversationId == null) upgrade.isVisible = !state.upgraded } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt index 03735b05..333040b1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt @@ -23,6 +23,7 @@ import dagger.Module import dagger.Provides import dagger.multibindings.IntoMap import dev.octoshrimpy.quik.injection.ViewModelKey +import javax.inject.Named @Module class ScheduledActivityModule { @@ -32,4 +33,9 @@ class ScheduledActivityModule { @ViewModelKey(ScheduledViewModel::class) fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel -} \ No newline at end of file + @Provides + @Named("conversationId") + fun getConversationId(activity: ScheduledActivity): + Long? = activity.intent.extras?.getLong("conversationId") + +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt index 92d42439..25b790e7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt @@ -25,4 +25,5 @@ data class ScheduledState( val scheduledMessages: RealmResults? = null, val upgraded: Boolean = true, val selectedMessages: Int = 0, + val conversationId: Long? = null, ) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt index d2608ec9..e57c504b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt @@ -15,8 +15,10 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.plusAssign import io.reactivex.schedulers.Schedulers import javax.inject.Inject +import javax.inject.Named class ScheduledViewModel @Inject constructor( + @Named("conversationId") private val conversationId: Long?, billingManager: BillingManager, private val context: Context, private val navigator: Navigator, @@ -24,10 +26,12 @@ class ScheduledViewModel @Inject constructor( private val sendScheduledMessageInteractor: SendScheduledMessage, private val deleteScheduledMessagesInteractor: DeleteScheduledMessages, ) : QkViewModel(ScheduledState( - scheduledMessages = scheduledMessageRepo.getScheduledMessages() + scheduledMessages = scheduledMessageRepo.getScheduledMessages(), + conversationId = conversationId )) { init { + loadMessages(conversationId) disposables += billingManager.upgradeStatus .subscribe { upgraded -> newState { copy(upgraded = upgraded) } } } @@ -157,4 +161,12 @@ class ScheduledViewModel @Inject constructor( .autoDisposable(view.scope()) .subscribe { navigator.showQksmsPlusActivity("schedule_fab") } } + + private fun loadMessages(conversationId: Long?) { + val results = if (conversationId != null) + scheduledMessageRepo.getScheduledMessagesForConversation(conversationId) + else + scheduledMessageRepo.getScheduledMessages() + newState { copy(scheduledMessages = results) } + } } diff --git a/presentation/src/main/res/layout/conversation_list_item.xml b/presentation/src/main/res/layout/conversation_list_item.xml index 524c714d..e528615c 100644 --- a/presentation/src/main/res/layout/conversation_list_item.xml +++ b/presentation/src/main/res/layout/conversation_list_item.xml @@ -69,7 +69,7 @@ android:ellipsize="end" android:maxLines="1" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/pinned" + app:layout_constraintEnd_toStartOf="@id/scheduled" app:layout_constraintStart_toStartOf="@id/title" app:layout_constraintTop_toBottomOf="@id/title" tools:text="@tools:sample/lorem/random" /> @@ -80,9 +80,23 @@ android:layout_height="16dp" android:layout_marginTop="2dp" android:paddingStart="4dp" + android:paddingTop="2dp" android:src="@drawable/ic_baseline_push_pin_24" android:tint="?android:attr/textColorTertiary" android:visibility="gone" + app:layout_constraintEnd_toStartOf="@id/scheduled" + app:layout_constraintTop_toTopOf="@id/snippet" + tools:visibility="visible" /> + + diff --git a/presentation/src/main/res/menu/compose.xml b/presentation/src/main/res/menu/compose.xml index 87ff23a5..c88f5315 100644 --- a/presentation/src/main/res/menu/compose.xml +++ b/presentation/src/main/res/menu/compose.xml @@ -34,6 +34,13 @@ android:visible="false" app:showAsAction="always" /> + + Selected time must be in the future! You must unlock QUIK+ to use scheduled messaging Added to scheduled messages + Scheduled messages for this conversation Write a message… Can\'t send to other participants Copy text From d48be16bed104c70fec1adc68b1861325fb0fba9 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Thu, 17 Jul 2025 18:07:12 -0700 Subject: [PATCH 45/99] Fix padding issues in schedule dialog The bottom of the title was getting ever so slightly cut off, this adds a little extra padding so that doesn't happen. --- presentation/src/main/res/layout/compose_activity.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 0c1a5b1c..9288eb5e 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -207,6 +207,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="16dp" + android:paddingBottom="2dp" android:text="@string/compose_scheduled_for" android:textColor="?android:attr/textColorPrimary" android:textStyle="bold" From 4e0b62e28ecc7d1fd196cbba1d0e08d7f472d241 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 18 Jul 2025 11:56:33 -0700 Subject: [PATCH 46/99] Change title of the scheduled dialog to `Scheduled Time:` --- presentation/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index fcd4ecb4..d52c6496 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -135,7 +135,7 @@ Recipients and replies will be visible to everyone This is the start of your conversation. Say something nice! Contact card - Scheduled for + Scheduled time: Selected time must be in the future! You must unlock QUIK+ to use scheduled messaging Added to scheduled messages From 67e5647f5ddb60c5e87ae9018fac91587a7f53e6 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 18 Jul 2025 13:53:22 -0700 Subject: [PATCH 47/99] Migrate remaining components to androidx --- .../java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt | 2 +- .../feature/blocking/messages/BlockedMessagesController.kt | 4 ++-- .../java/com/moez/QKSMS/feature/compose/ComposeActivity.kt | 4 ++-- .../main/java/com/moez/QKSMS/feature/main/MainActivity.kt | 2 +- .../com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt | 7 ++++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt index b73dce8a..b8594c98 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingDialog.kt @@ -19,8 +19,8 @@ package dev.octoshrimpy.quik.feature.blocking import android.app.Activity -import android.app.AlertDialog import android.content.Context +import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.interactor.MarkBlocked diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt index adc207d1..44dfefee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesController.kt @@ -18,12 +18,12 @@ */ package dev.octoshrimpy.quik.feature.blocking.messages -import android.app.AlertDialog import android.content.Context import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkController import dev.octoshrimpy.quik.common.util.Colors @@ -107,7 +107,7 @@ class BlockedMessagesController : QkController) { val count = conversations.size - AlertDialog.Builder(activity) + AlertDialog.Builder(activity!!) .setTitle(R.string.dialog_delete_title) .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index 9c07846f..c0f04a23 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -729,7 +729,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override fun showDeleteDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) } @@ -738,7 +738,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { } override fun showClearCurrentMessageDialog() { - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_clear_compose_title) .setMessage(R.string.dialog_clear_compose) .setPositiveButton(R.string.button_clear) { _, _ -> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index fed83338..407c626a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.main import android.Manifest import android.animation.ObjectAnimator -import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList import android.os.Build @@ -31,6 +30,7 @@ import android.view.MenuItem import android.view.View import android.view.ViewStub import androidx.appcompat.app.ActionBarDrawerToggle +import androidx.appcompat.app.AlertDialog import androidx.core.app.ActivityCompat import androidx.core.view.GravityCompat import androidx.core.view.isVisible diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt index 73aaa7df..24fcbb57 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.feature.scheduled import android.os.Bundle import android.view.Menu import android.view.MenuItem +import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProviders @@ -109,7 +110,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override fun showDeleteDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_delete_title) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) } @@ -119,7 +120,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { override fun showSendNowDialog(messages: List) { val count = messages.size - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.main_menu_send_now) .setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count)) .setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) } @@ -128,7 +129,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView { } override fun showEditMessageDialog(message: Long) { - android.app.AlertDialog.Builder(this) + AlertDialog.Builder(this) .setTitle(R.string.dialog_edit_scheduled_message_title) .setMessage(R.string.dialog_edit_scheduled_message) .setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ -> From 455b5eeae69a272a7a1ca2293d039477f4395795 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 12 Jul 2025 18:08:13 -0700 Subject: [PATCH 48/99] Clean up gradle files Removed deprecated j-center, and commented out dependencies. --- android-smsmms/build.gradle | 2 -- build.gradle | 3 +-- common/build.gradle | 1 - data/build.gradle | 6 ------ domain/build.gradle | 5 ----- gradle.properties | 1 - presentation/build.gradle | 7 +++---- 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 9c8c996f..61e3b2f7 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -41,7 +41,6 @@ dependencies { implementation 'com.squareup.okhttp:okhttp:2.5.0' implementation 'com.squareup.okhttp:okhttp-urlconnection:2.5.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -// implementation 'javax.annotation:javax.annotation-api:1.3.2' } repositories { @@ -53,5 +52,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1e6de0b2..de3e2c1d 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,6 @@ buildscript { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } dependencies { @@ -72,7 +71,7 @@ allprojects { } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/common/build.gradle b/common/build.gradle index f240c7c4..01bfcc38 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -48,5 +48,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/data/build.gradle b/data/build.gradle index 1ca9a517..7077cecd 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -22,7 +22,6 @@ apply plugin: 'kotlin-kapt' android { compileSdk 34 - publishNonDefault true compileOptions { sourceCompatibility 1.8 @@ -33,8 +32,6 @@ android { minSdk 23 targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - - buildConfigField "String", "AMPLITUDE_API_KEY", "\"${System.getenv("AMPLITUDE_API_KEY")}\"" } namespace 'dev.octoshrimpy.quik.data' @@ -59,8 +56,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // rxjava @@ -109,5 +104,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/domain/build.gradle b/domain/build.gradle index 2d07c9c1..9c0d0c16 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -46,8 +46,6 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // realm @@ -70,8 +68,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(":common") -// implementation 'com.github.pengrad:jdk9-deps:1ffe84c' - } repositories { @@ -83,5 +79,4 @@ repositories { url 'https://oss.sonatype.org/content/repositories/snapshots' } mavenCentral() - jcenter() } diff --git a/gradle.properties b/gradle.properties index 9d2f340c..887e2632 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx1536m org.gradle.caching=true android.useAndroidX=true android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false android.nonFinalResIds=false diff --git a/presentation/build.gradle b/presentation/build.gradle index 00f16f65..ef9cd9c0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -87,6 +87,9 @@ android { abortOnError false } namespace 'dev.octoshrimpy.quik' + buildFeatures { + buildConfig true + } if (System.getenv("CI") == "true") { signingConfigs.release.storePassword = System.getenv("keystore_password") signingConfigs.release.keyAlias = System.getenv("key_alias") @@ -147,11 +150,8 @@ dependencies { implementation "com.google.dagger:dagger-android-support:$dagger_version" kapt "com.google.dagger:dagger-compiler:$dagger_version" kapt "com.google.dagger:dagger-android-processor:$dagger_version" -// compileOnly "javax.annotation:jsr250-api:1.0" //Resolve jdk8+ Generation Annotations - javax annotation does not exist implementation 'com.github.pengrad:jdk9-deps:1ffe84c468' - -// look into jakarta.annotation-api when switching to java 9 implementation 'javax.annotation:javax.annotation-api:1.3.2' // ezvcard @@ -163,7 +163,6 @@ dependencies { // realm implementation "com.github.realm:realm-android-adapters:$realm_adapters_version" -// implementation("io.realm:android-adapters:$realm_adapters_version") { transitive = false } kapt "io.realm:realm-annotations:$realm_version" kapt "io.realm:realm-annotations-processor:$realm_version" From 3bf1e710225058335b36342ea0adf04cf84443d8 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 19 Jul 2025 12:02:10 -0700 Subject: [PATCH 49/99] Expose both mark read and unread in conversation screen It doesn't clutter the UI too much, and can be useful if people want to mark all the conversations one way or the other. --- .../main/java/com/moez/QKSMS/feature/main/MainActivity.kt | 6 ++++-- .../main/java/com/moez/QKSMS/feature/main/MainViewModel.kt | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 51d6a22e..89980cee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -255,8 +255,10 @@ class MainActivity : QkThemedActivity(), MainView { findItem(R.id.add)?.isVisible = addContact && selectedConversations != 0 findItem(R.id.pin)?.isVisible = markPinned && selectedConversations != 0 findItem(R.id.unpin)?.isVisible = !markPinned && selectedConversations != 0 - findItem(R.id.read)?.isVisible = markRead && selectedConversations != 0 - findItem(R.id.unread)?.isVisible = !markRead && selectedConversations != 0 + findItem(R.id.read)?.isVisible = ( markRead && selectedConversations != 0 ) || + selectedConversations > 1 + findItem(R.id.unread)?.isVisible = ( !markRead && selectedConversations != 0 ) || + selectedConversations > 1 findItem(R.id.block)?.isVisible = selectedConversations != 0 findItem(R.id.rename)?.isVisible = selectedConversations == 1 } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 32d0409d..36a4d96a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -467,7 +467,11 @@ class MainViewModel @Inject constructor( ?.recipients?.first() ?.takeIf { recipient -> recipient.contact == null } != null val pin = conversations.sumBy { if (it.pinned) -1 else 1 } >= 0 - val read = conversations.sumBy { if (!it.unread) -1 else 1 } >= 0 + val read = when (conversations.size) { + 0 -> false + 1 -> conversations[0].unread + else -> true + } val selected = selection.size when (state.page) { From 25f4716572f387b745e5fda31e4b57747a24f5b7 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 19 Jul 2025 16:28:44 -0700 Subject: [PATCH 50/99] Add Mark Unread action to conversation settings --- .../src/main/java/com/moez/QKSMS/common/Navigator.kt | 6 ++++++ .../conversationinfo/ConversationInfoAdapter.kt | 2 ++ .../conversationinfo/ConversationInfoController.kt | 4 ++-- .../conversationinfo/ConversationInfoPresenter.kt | 10 ++++++++++ .../feature/conversationinfo/ConversationInfoView.kt | 1 + .../src/main/res/layout/conversation_info_settings.xml | 7 +++++++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt index d867e794..92167d1b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt @@ -36,6 +36,7 @@ import dev.octoshrimpy.quik.feature.blocking.BlockingActivity import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoActivity import dev.octoshrimpy.quik.feature.gallery.GalleryActivity +import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.feature.notificationprefs.NotificationPrefsActivity import dev.octoshrimpy.quik.feature.plus.PlusActivity import dev.octoshrimpy.quik.feature.scheduled.ScheduledActivity @@ -92,6 +93,11 @@ class Navigator @Inject constructor( } } + fun showMainActivity() { + val intent = Intent(context, MainActivity::class.java) + startActivity(intent) + } + fun showCompose(body: String? = null, attachments: List? = null, mode: String? = null) { val intent = Intent(context, ComposeActivity::class.java) intent.putExtra(Intent.EXTRA_TEXT, body) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt index 35182204..e34663e9 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoAdapter.kt @@ -31,6 +31,7 @@ class ConversationInfoAdapter @Inject constructor( val themeClicks: Subject = PublishSubject.create() val nameClicks: Subject = PublishSubject.create() val notificationClicks: Subject = PublishSubject.create() + val markUnreadClicks: Subject = PublishSubject.create() val archiveClicks: Subject = PublishSubject.create() val blockClicks: Subject = PublishSubject.create() val deleteClicks: Subject = PublishSubject.create() @@ -60,6 +61,7 @@ class ConversationInfoAdapter @Inject constructor( 1 -> QkViewHolder(inflater.inflate(R.layout.conversation_info_settings, parent, false)).apply { groupName.clicks().subscribe(nameClicks) notifications.clicks().subscribe(notificationClicks) + markUnread.clicks().subscribe(markUnreadClicks) archive.clicks().subscribe(archiveClicks) block.clicks().subscribe(blockClicks) delete.clicks().subscribe(deleteClicks) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt index e8a6c66a..e7c64578 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt @@ -102,6 +102,7 @@ class ConversationInfoController( override fun nameClicks(): Observable<*> = adapter.nameClicks override fun nameChanges(): Observable = nameChangeSubject override fun notificationClicks(): Observable<*> = adapter.notificationClicks + override fun markUnreadClicks(): Observable<*> = adapter.markUnreadClicks override fun archiveClicks(): Observable<*> = adapter.archiveClicks override fun blockClicks(): Observable<*> = adapter.blockClicks override fun deleteClicks(): Observable<*> = adapter.deleteClicks @@ -132,5 +133,4 @@ class ConversationInfoController( .setNegativeButton(R.string.button_cancel, null) .show() } - -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt index f642444f..209c56fe 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt @@ -34,6 +34,7 @@ import dev.octoshrimpy.quik.feature.conversationinfo.ConversationInfoItem.Conver import dev.octoshrimpy.quik.interactor.DeleteConversations import dev.octoshrimpy.quik.interactor.MarkArchived import dev.octoshrimpy.quik.interactor.MarkUnarchived +import dev.octoshrimpy.quik.interactor.MarkUnread import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.repository.ConversationRepository @@ -53,6 +54,7 @@ class ConversationInfoPresenter @Inject constructor( private val context: Context, private val conversationRepo: ConversationRepository, private val deleteConversations: DeleteConversations, + private val markUnread: MarkUnread, private val markArchived: MarkArchived, private val markUnarchived: MarkUnarchived, private val navigator: Navigator, @@ -158,6 +160,14 @@ class ConversationInfoPresenter @Inject constructor( .autoDisposable(view.scope()) .subscribe { conversation -> navigator.showNotificationSettings(conversation.id) } + view.markUnreadClicks() + .withLatestFrom(conversation) { _, conversation -> conversation } + .autoDisposable(view.scope()) + .subscribe {conversation -> + markUnread.execute(listOf(conversation.id)) + navigator.showMainActivity() + } + // Toggle the archived state of the conversation view.archiveClicks() .withLatestFrom(conversation) { _, conversation -> conversation } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt index b0ab0561..cf0124bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt @@ -29,6 +29,7 @@ interface ConversationInfoView : QkViewContract { fun nameClicks(): Observable<*> fun nameChanges(): Observable fun notificationClicks(): Observable<*> + fun markUnreadClicks(): Observable<*> fun archiveClicks(): Observable<*> fun blockClicks(): Observable<*> fun deleteClicks(): Observable<*> diff --git a/presentation/src/main/res/layout/conversation_info_settings.xml b/presentation/src/main/res/layout/conversation_info_settings.xml index 2a52ef13..53715b64 100644 --- a/presentation/src/main/res/layout/conversation_info_settings.xml +++ b/presentation/src/main/res/layout/conversation_info_settings.xml @@ -43,6 +43,13 @@ app:icon="@drawable/ic_notifications_black_24dp" app:title="@string/info_notifications" /> + + Date: Thu, 24 Jul 2025 05:14:26 -0500 Subject: [PATCH 51/99] Combine content filter and scheduled message field updates on realm migration --- .../main/java/com/moez/QKSMS/migration/QkRealmMigration.kt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index a29afbb4..6f7c22bf 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -239,10 +239,6 @@ class QkRealmMigration @Inject constructor( // Because there was never any property associated with which conversation/recipients a scheduled message was for, // we can't update this field on a realm migration. It will be set to a default of 0 - version++ - } - - if (version == 11L) { realm.schema.create("MessageContentFilter") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) .addField("value", String::class.java, FieldAttribute.REQUIRED) From 9478923a2b91019b5948a0c415e5bd303bbe1092 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Wed, 30 Jul 2025 09:26:40 -0700 Subject: [PATCH 52/99] Change attachments to be saved with `QUIK_format_date` This is preferable to defualting to the original name, as those are often not descriptive, or generic. --- .../com/moez/QKSMS/repository/MessageRepositoryImpl.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 5a85406d..f90bda9d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -171,9 +171,10 @@ open class MessageRepositoryImpl @Inject constructor( val extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(part.type) ?: return null - val date = part.messages?.first()?.date - val fileName = part.name?.takeIf { name -> name.endsWith(extension) } - ?: "${part.type.split("/").last()}_$date.$extension" + // fileDateAndTime is divided by 1000 in order to remove the extra 0's after date and time + // This way the file name isn't so long. + val fileDateAndTime = (part.messages?.first()?.date)?.div(1000) + val fileName = "QUIK_${part.type.split("/").last()}_$fileDateAndTime.$extension" val values = contentValuesOf( MediaStore.MediaColumns.DISPLAY_NAME to fileName, From 5f5a92faac200858a6c7a680b310a9c452a19bda Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Sat, 2 Aug 2025 13:05:41 -0700 Subject: [PATCH 53/99] Fix draft being sorted at the bottom In some cases, if no date was set, it would get sorted to the bottom --- .../com/moez/QKSMS/migration/QkRealmMigration.kt | 12 +++++++----- .../QKSMS/repository/ConversationRepositoryImpl.kt | 1 + .../main/java/com/moez/QKSMS/model/Conversation.kt | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index a29afbb4..3e56541f 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 12 + const val SchemaVersion: Long = 13 } @SuppressLint("ApplySharedPref") @@ -239,10 +239,6 @@ class QkRealmMigration @Inject constructor( // Because there was never any property associated with which conversation/recipients a scheduled message was for, // we can't update this field on a realm migration. It will be set to a default of 0 - version++ - } - - if (version == 11L) { realm.schema.create("MessageContentFilter") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) .addField("value", String::class.java, FieldAttribute.REQUIRED) @@ -253,6 +249,12 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 12L) { + realm.schema.get("Conversation") + ?.addField("draftDate", Long::class.java, FieldAttribute.REQUIRED) + version++ + } + check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index 11da4d2f..ac5c0102 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -353,6 +353,7 @@ class ConversationRepositoryImpl @Inject constructor( realm.executeTransaction { conversation?.takeIf { it.isValid }?.draft = draft + conversation?.takeIf { it.isValid }?.draftDate = System.currentTimeMillis() } } diff --git a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt index 4210ba69..37293297 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Conversation.kt @@ -31,6 +31,7 @@ open class Conversation( var recipients: RealmList = RealmList(), var lastMessage: Message? = null, var draft: String = "", + var draftDate: Long = 0, var blockingClient: Int? = null, var blockReason: String? = null, @@ -38,7 +39,7 @@ open class Conversation( var name: String = "" // For group chats, the user is allowed to set a custom title for the conversation ) : RealmObject() { - val date: Long get() = lastMessage?.date ?: 0 + val date: Long get() = lastMessage?.date ?: if (draft.isNotEmpty()) draftDate else 0 val snippet: String? get() = lastMessage?.getSummary() val unread: Boolean get() = lastMessage?.read == false val me: Boolean get() = lastMessage?.isMe() == true From ac733021e86bf874ad274ff3fe9ed3b2ad3d98ee Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 1 Aug 2025 15:13:36 -0700 Subject: [PATCH 54/99] Force widget to respect system dark and light mode --- .../java/com/moez/QKSMS/feature/widget/WidgetProvider.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 78c6f191..3b6e4a4f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -25,6 +25,7 @@ import android.appwidget.AppWidgetProvider import android.content.ComponentName import android.content.Context import android.content.Intent +import android.content.res.Configuration import android.net.Uri import android.os.Bundle import android.widget.RemoteViews @@ -109,8 +110,11 @@ class WidgetProvider : AppWidgetProvider() { Timber.v("updateWidget appWidgetId: $appWidgetId") val remoteViews = RemoteViews(context.packageName, R.layout.widget) + val nightModeFlags = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + val isNightMode = nightModeFlags == Configuration.UI_MODE_NIGHT_YES + // Apply colors from theme - val night = prefs.night.get() + val night = prefs.night.get() || isNightMode val black = prefs.black.get() remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when { From 8659466477b8c0897232e2e91f2232a75a6dc687 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 11 Aug 2025 13:22:07 -0700 Subject: [PATCH 55/99] Fix some various deprecated code bits in the widget --- .../main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt | 2 +- .../main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt index 14e4c00a..f08f2bdb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetAdapter.kt @@ -94,7 +94,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory { * we'll return the max count + 1, where the last row just shows "View more conversations" */ override fun getCount(): Int { - val count = Math.min(conversations.size, MAX_CONVERSATIONS_COUNT) + val count = conversations.size.coerceAtMost(MAX_CONVERSATIONS_COUNT) val shouldShowViewMore = count < conversations.size return count + if (shouldShowViewMore) 1 else 0 } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt index 3b6e4a4f..8ff9ed13 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/widget/WidgetProvider.kt @@ -26,7 +26,6 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.res.Configuration -import android.net.Uri import android.os.Bundle import android.widget.RemoteViews import dagger.android.AndroidInjection @@ -40,6 +39,7 @@ import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver import dev.octoshrimpy.quik.util.Preferences import timber.log.Timber import javax.inject.Inject +import androidx.core.net.toUri class WidgetProvider : AppWidgetProvider() { @@ -138,7 +138,7 @@ class WidgetProvider : AppWidgetProvider() { val intent = Intent(context, WidgetService::class.java) .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) .putExtra("small_widget", smallWidget) - intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)) + intent.data = intent.toUri(Intent.URI_INTENT_SCHEME).toUri() remoteViews.setRemoteAdapter(R.id.conversations, intent) // compose new message image color and on click intent From 1eaacc97ed0826323932e773987663e8eb67219f Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Mon, 11 Aug 2025 13:40:24 -0700 Subject: [PATCH 56/99] Add a more descriptive name for the convo widget --- presentation/src/main/AndroidManifest.xml | 1 + presentation/src/main/res/values/strings.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index e96f2d2a..9009d685 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -201,6 +201,7 @@ diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 72ecdb1e..5d7a4a13 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -433,6 +433,7 @@ Loading… View more conversations + All Conversations Mark read Call From 7712deeb823f0cc39db497706cea0add0adedc40 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 22 Aug 2025 16:35:59 -0700 Subject: [PATCH 57/99] Fix PII leaked in logs Conversation.title was being used in logging, which is either contact name, or phone number. --- .../main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index 983c480b..fc352ae5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt @@ -101,7 +101,7 @@ class ShortcutManagerImpl @Inject constructor( @TargetApi(29) private fun createShortcutForConversation(conversation: Conversation): ShortcutInfoCompat { - Timber.v("creating shortcut for conversation ${conversation.id} : ${conversation.getTitle()}") + Timber.v("creating shortcut for conversation ${conversation.id}") val icon = when { conversation.recipients.size == 1 -> { val recipient = conversation.recipients.first()!! From 1d56096dd808fb2daaa8dbbb00becc820a5342c5 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 22 Aug 2025 16:44:04 -0700 Subject: [PATCH 58/99] Bump Timber to 5.0.1 --- build.gradle | 2 +- .../src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index de3e2c1d..9d2e3054 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { ext.rxjava_version = '2.1.4' ext.rxkotlin_version = '2.1.0' ext.rx_preferences_version = '2.0.0-RC3' - ext.timber_version = '4.5.1' + ext.timber_version = '5.0.1' ext.androidx_work_version = "2.8.0" ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt index bead7e56..db425a3a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/FileLoggingTree.kt @@ -45,7 +45,7 @@ class FileLoggingTree @Inject constructor( private var logFileUri: Uri? = null - override fun log(priority: Int, tag: String, message: String, t: Throwable?) { + override fun log(priority: Int, tag: String?, message: String, t: Throwable?) { if (!prefs.logging.get()) return Schedulers.io().scheduleDirect { From f3afdb3b95891b145c5452ca4007fd6603fe60d2 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Fri, 22 Aug 2025 10:11:32 -0700 Subject: [PATCH 59/99] Refactor sync code to use an async transaction/separate looper thread This makes the sync more robust when handling larger message db, as well gives speed improvements. --- .../QKSMS/repository/SyncRepositoryImpl.kt | 269 ++++++++++-------- 1 file changed, 153 insertions(+), 116 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 00464616..986cfd9b 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -21,6 +21,8 @@ package dev.octoshrimpy.quik.repository import android.content.ContentResolver import android.content.ContentUris import android.net.Uri +import android.os.Handler +import android.os.HandlerThread import android.provider.Telephony import com.f2prateek.rx.preferences2.RxSharedPreferences import dev.octoshrimpy.quik.extensions.forEach @@ -49,6 +51,7 @@ import io.reactivex.subjects.Subject import io.realm.Realm import io.realm.RealmList import io.realm.Sort +import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton @@ -73,146 +76,171 @@ class SyncRepositoryImpl @Inject constructor( override fun syncMessages() { + val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders") + // If the sync is already running, don't try to do another one if (syncProgress.blockingFirst() is SyncRepository.SyncProgress.Running) return syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) - val realm = Realm.getDefaultInstance() - realm.beginTransaction() + val handlerThread = HandlerThread("RealmSyncThread") + handlerThread.start() + Handler(handlerThread.looper).post { + Realm.getDefaultInstance().executeTransactionAsync( + { realm -> + // Prepare existing conversation data + val persistedData = realm.copyFromRealm( + realm.where(Conversation::class.java) + .beginGroup() + .equalTo("archived", true) + .or() + .equalTo("blocked", true) + .or() + .equalTo("pinned", true) + .or() + .isNotEmpty("name") + .or() + .isNotNull("blockingClient") + .or() + .isNotEmpty("blockReason") + .endGroup() + .findAll() + ).associateBy { conversation -> conversation.id }.toMutableMap() - val persistedData = realm.copyFromRealm(realm.where(Conversation::class.java) - .beginGroup() - .equalTo("archived", true) - .or() - .equalTo("blocked", true) - .or() - .equalTo("pinned", true) - .or() - .isNotEmpty("name") - .or() - .isNotNull("blockingClient") - .or() - .isNotEmpty("blockReason") - .endGroup() - .findAll()) - .associateBy { conversation -> conversation.id } - .toMutableMap() + removeOldMessages(realm) - realm.delete(Contact::class.java) - realm.delete(ContactGroup::class.java) - realm.delete(Conversation::class.java) - realm.delete(Message::class.java) - realm.delete(MmsPart::class.java) - realm.delete(Recipient::class.java) + keys.reset() - keys.reset() + val partsCursor = cursorToPart.getPartsCursor() + val messageCursor = cursorToMessage.getMessagesCursor() + val conversationCursor = cursorToConversation.getConversationsCursor() + val recipientCursor = cursorToRecipient.getRecipientCursor() - val partsCursor = cursorToPart.getPartsCursor() - val messageCursor = cursorToMessage.getMessagesCursor() - val conversationCursor = cursorToConversation.getConversationsCursor() - val recipientCursor = cursorToRecipient.getRecipientCursor() + val max = (partsCursor?.count ?: 0) + + (messageCursor?.count ?: 0) + + (conversationCursor?.count ?: 0) + + (recipientCursor?.count ?: 0) - val max = (partsCursor?.count ?: 0) + - (messageCursor?.count ?: 0) + - (conversationCursor?.count ?: 0) + - (recipientCursor?.count ?: 0) + var progress = 0 - var progress = 0 - - // Sync message parts - partsCursor?.use { - partsCursor.forEach { - tryOrNull { - progress++ - val part = cursorToPart.map(partsCursor) - realm.insertOrUpdate(part) + // Sync message parts + partsCursor?.use { + partsCursor.forEach { cursor -> + tryOrNull { + val part = cursorToPart.map(partsCursor) + realm.insertOrUpdate(part) + progress++ + } + } } - } - } - // Sync messages - messageCursor?.use { - val messageColumns = CursorToMessage.MessageColumns(messageCursor) - messageCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply { - if (isMms()) { - parts = RealmList().apply { - addAll(realm.where(MmsPart::class.java) - .equalTo("messageId", contentId) - .findAll()) + // Sync messages + messageCursor?.use { + val messageColumns = CursorToMessage.MessageColumns(messageCursor) + messageCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val message = cursorToMessage.map(Pair(cursor, messageColumns)).apply { + if (isMms()) { + parts = RealmList().apply { + addAll( + realm.where(MmsPart::class.java) + .equalTo("messageId", contentId) + .findAll() + ) + } + } } + realm.insertOrUpdate(message) } } - realm.insertOrUpdate(message) } - } - } - // Migrate blocked conversations from 2.7.3 - val oldBlockedSenders = rxPrefs.getStringSet("pref_key_blocked_senders") - oldBlockedSenders.get() - .map { threadIdString -> threadIdString.toLong() } - .filter { threadId -> !persistedData.contains(threadId) } - .forEach { threadId -> persistedData[threadId] = Conversation(id = threadId, blocked = true) } - - // Sync conversations - conversationCursor?.use { - conversationCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val conversation = cursorToConversation.map(cursor).apply { - persistedData[id]?.let { persistedConversation -> - archived = persistedConversation.archived - blocked = persistedConversation.blocked - pinned = persistedConversation.pinned - name = persistedConversation.name - blockingClient = persistedConversation.blockingClient - blockReason = persistedConversation.blockReason - } - lastMessage = realm.where(Message::class.java) - .sort("date", Sort.DESCENDING) - .equalTo("threadId", id) - .findFirst() + // Migrate blocked conversations from 2.7.3 + oldBlockedSenders.get() + .map { threadIdString -> threadIdString.toLong() } + .filter { threadId -> !persistedData.contains(threadId) } + .forEach { threadId -> + persistedData[threadId] = Conversation(id = threadId, blocked = true) } - realm.insertOrUpdate(conversation) - } - } - } - // Sync recipients - recipientCursor?.use { - val contacts = realm.copyToRealmOrUpdate(getContacts()) - recipientCursor.forEach { cursor -> - tryOrNull { - progress++ - syncProgress.onNext(SyncRepository.SyncProgress.Running(max, progress, false)) - val recipient = cursorToRecipient.map(cursor).apply { - contact = contacts.firstOrNull { contact -> - contact.numbers.any { phoneNumberUtils.compare(address, it.address) } + // Sync conversations + conversationCursor?.use { + conversationCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val conversation = cursorToConversation.map(cursor).apply { + persistedData[id]?.let { persistedConversation -> + archived = persistedConversation.archived + blocked = persistedConversation.blocked + pinned = persistedConversation.pinned + name = persistedConversation.name + blockingClient = persistedConversation.blockingClient + blockReason = persistedConversation.blockReason + } + lastMessage = realm.where(Message::class.java) + .sort("date", Sort.DESCENDING) + .equalTo("threadId", id) + .findFirst() + } + realm.insertOrUpdate(conversation) } } - realm.insertOrUpdate(recipient) } - } + + // Sync recipients + val contacts = realm.copyToRealmOrUpdate(getContacts()) + recipientCursor?.use { + recipientCursor.forEach { cursor -> + tryOrNull { + syncProgress.onNext( + SyncRepository.SyncProgress.Running( + max, + ++progress, + false + ) + ) + val rec = cursorToRecipient.map(cursor).apply { + contact = contacts.firstOrNull { c -> + c.numbers.any { num -> + phoneNumberUtils.compare( + address, + num.address + ) + } + } + } + realm.insertOrUpdate(rec) + } + } + } + + syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) + + realm.insert(SyncLog()) + }, { + handlerThread.quitSafely() + oldBlockedSenders.delete() + syncProgress.onNext(SyncRepository.SyncProgress.Idle) + }, + { error -> + handlerThread.quitSafely() + Timber.e(error, "syncMessages Failed") + syncProgress.onNext(SyncRepository.SyncProgress.Idle) + }) } - - syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) - - - realm.insert(SyncLog()) - realm.commitTransaction() - realm.close() - - // Only delete this after the sync has successfully completed - oldBlockedSenders.delete() - - syncProgress.onNext(SyncRepository.SyncProgress.Idle) } - override fun syncMessage(uri: Uri): Message? { // If we don't have a valid type, return null @@ -345,4 +373,13 @@ class SyncRepositoryImpl @Inject constructor( return groups } + private fun removeOldMessages(realm: Realm) { + realm.delete(Contact::class.java) + realm.delete(ContactGroup::class.java) + realm.delete(Conversation::class.java) + realm.delete(Message::class.java) + realm.delete(MmsPart::class.java) + realm.delete(Recipient::class.java) + } + } From f066b98c1f7c15a5794523ca2fb003b591de0bb0 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 26 Aug 2025 13:06:24 -0400 Subject: [PATCH 60/99] Bump kotlin version to 1.7.21 I'm unable to compile the app on 1.7.20 due to: java.lang.IllegalAccessError: superclass access check failed: class org.jetbrains.kotlin.kapt3.base.javac.KaptJavaCompiler (in unnamed module @0x47dc37ed) cannot access class com.sun.tools.javac.main.JavaCompiler (in module jdk.compiler) because module jdk.compiler does not export com.sun.tools.javac.main to unnamed module @0x47dc37ed' --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index de3e2c1d..02175ba6 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { ext.exoplayer_version = "r2.9.0" ext.glide_version = "4.16.0" ext.junit_version = '4.12' - ext.kotlin_version = '1.7.20' + ext.kotlin_version = '1.7.21' ext.lifecycle_version = '2.1.0' ext.material_version = '1.0.0' ext.mockito_version = '2.18.3' From 401b70d16aa3b32206529fdc6ffcfbe1da14a096 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 26 Aug 2025 16:17:23 -0400 Subject: [PATCH 61/99] Parse and render emoji reactions Fixes part of #152 To keep this PR simple, I've left out: - when long-pressing on the emoji in a group MMS, a popup should come up listing which contact sent each emoji - notifications (untested) - sending emoji reactions --- .../moez/QKSMS/migration/QkRealmMigration.kt | 24 +++- .../QKSMS/repository/MessageRepositoryImpl.kt | 22 +++ .../QKSMS/repository/SyncRepositoryImpl.kt | 56 ++++++++ .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 134 ++++++++++++++++++ .../com/moez/QKSMS/model/EmojiReaction.kt | 52 +++++++ .../main/java/com/moez/QKSMS/model/Message.kt | 1 + .../moez/QKSMS/feature/compose/BubbleUtils.kt | 1 + .../QKSMS/feature/compose/MessagesAdapter.kt | 57 ++++++++ .../main/res/layout/message_list_item_in.xml | 41 +++++- .../main/res/layout/message_list_item_out.xml | 58 ++++++-- 10 files changed, 432 insertions(+), 14 deletions(-) create mode 100644 data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt create mode 100644 domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index a29afbb4..5b0da597 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -36,7 +36,7 @@ class QkRealmMigration @Inject constructor( ) : RealmMigration { companion object { - const val SchemaVersion: Long = 12 + const val SchemaVersion: Long = 13 } @SuppressLint("ApplySharedPref") @@ -253,6 +253,28 @@ class QkRealmMigration @Inject constructor( version++ } + if (version == 12L) { + realm.schema.create("EmojiReaction") + .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) + .addField("targetMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) + .addField("emoji", String::class.java, FieldAttribute.REQUIRED) + .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) + .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) + .addField("patternType", String::class.java, FieldAttribute.REQUIRED) + + realm.schema.get("Message") + ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) + ?.transform { msg -> + msg.setBoolean("isEmojiReaction", false) + } + + // TODO: scan for past emoji reaction messages + + version++ + } + check(version >= newVersion) { "Migration missing from v$oldVersion to v$newVersion" } } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 5a85406d..bf501966 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -57,6 +57,7 @@ import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver import dev.octoshrimpy.quik.util.ImageUtils +import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.tryOrNull @@ -88,6 +89,7 @@ open class MessageRepositoryImpl @Inject constructor( Realm.getDefaultInstance() .where(Message::class.java) .equalTo("threadId", threadId) + .equalTo("isEmojiReaction", false) .let { when (query.isEmpty()) { true -> it @@ -760,6 +762,26 @@ open class MessageRepositoryImpl @Inject constructor( // Update contentId after the message has been inserted to the content provider realm.executeTransaction { managedMessage?.contentId = id } } + + managedMessage?.let { savedMessage -> + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(body) + if (parsedReaction != null) { + val targetMessage = EmojiReactionUtils.findTargetMessage( + savedMessage.threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + EmojiReactionUtils.saveEmojiReaction( + savedMessage, + parsedReaction, + targetMessage, + messageIds, + realm, + ) + } + } + } } return message diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 00464616..2f13c09d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -42,6 +42,7 @@ import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SyncLog +import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.subjects.BehaviorSubject @@ -104,6 +105,7 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) + realm.delete(dev.octoshrimpy.quik.model.EmojiReaction::class.java) keys.reset() @@ -202,6 +204,39 @@ class SyncRepositoryImpl @Inject constructor( syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) + // Now that we have all the messages, we can scan for emoji reactions + val allMessages = realm.where(Message::class.java) + .beginGroup() + .beginGroup() + .equalTo("type", "sms") + .isNotEmpty("body") + .endGroup() + .or() + .beginGroup() + .equalTo("type", "mms") + .isNotEmpty("parts.text") + .endGroup() + .endGroup() + .findAll() + + allMessages.forEach { message -> + val text = message.getText(false) + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + if (parsedReaction != null) { + val targetMessage = EmojiReactionUtils.findTargetMessage( + message.threadId, + parsedReaction.originalMessage, + realm + ) + EmojiReactionUtils.saveEmojiReaction( + message, + parsedReaction, + targetMessage, + keys, + realm, + ) + } + } realm.insert(SyncLog()) realm.commitTransaction() @@ -259,6 +294,27 @@ class SyncRepositoryImpl @Inject constructor( conversationRepo.getOrCreateConversation(threadId) insertOrUpdate() + + val text = getText(false) + val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + if (parsedReaction != null) { + Realm.getDefaultInstance().use { realm -> + val targetMessage = EmojiReactionUtils.findTargetMessage( + threadId, + parsedReaction.originalMessage, + realm + ) + realm.executeTransaction { + EmojiReactionUtils.saveEmojiReaction( + this, + parsedReaction, + targetMessage, + keys, + realm, + ) + } + } + } } } } diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt new file mode 100644 index 00000000..5aa7f3bb --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ +package dev.octoshrimpy.quik.util + +import dev.octoshrimpy.quik.manager.KeyManager +import dev.octoshrimpy.quik.model.EmojiReaction +import dev.octoshrimpy.quik.model.Message +import io.realm.Realm +import io.realm.Sort +import timber.log.Timber + +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val patternType: String) + +object EmojiReactionUtils { + + fun parseEmojiReaction(body: String): ParsedEmojiReaction? { + // Log the raw message with unicode escapes for debugging + val escapedBody = body.map { char -> + when (char.code) { + in 0x20..0x7E -> char.toString() // printable ASCII + else -> "\\u${char.code.toString(16).padStart(4, '0')}" + } + }.joinToString("") + Timber.v("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? + + val iosPattern = Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") + val iosMatch = iosPattern.find(body) + if (iosMatch != null) { + val emoji = iosMatch.groupValues[1] + val originalMessage = iosMatch.groupValues[2] + + if (emoji == "with a sticker") { + Timber.d("Skipping sticker reaction: '$originalMessage'") + return null + } + + Timber.d("iOS pattern detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "ios") + } + + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") + val googleMatch = googleMessagesPattern.find(body) + if (googleMatch != null) { + val emoji = googleMatch.groupValues[1] + val originalMessage = googleMatch.groupValues[2] + Timber.d("Google Messages pattern detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "google") + } + + return null + } + + /** + * Search for messages in the same thread with matching text content + * We'll search recent messages first (within reasonable time window) + */ + fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + val messages = realm.where(Message::class.java) + .equalTo("threadId", threadId) + .sort("date", Sort.DESCENDING) + .limit(50) // TODO: should we keep this limit? + .findAll() + + val exactMatch = messages.find { message -> + message.getText(false).trim() == originalMessageText.trim() + } + if (exactMatch != null) { + Timber.d("Found exact match for reaction target: message ID ${exactMatch.id}") + return exactMatch + } + + // Try partial match (in case of truncation) + val partialMatch = messages.find { message -> + val text = message.getText(false).trim() + text.isNotEmpty() && ( + text.contains(originalMessageText.trim(), ignoreCase = true) || + originalMessageText.trim().contains(text, ignoreCase = true) + ) + } + if (partialMatch != null) { + Timber.d("Found partial match for reaction target: message ID ${partialMatch.id}") + return partialMatch + } + + Timber.w("No target message found for reaction text: '$originalMessageText'") + return null + } + + fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + keyManager: KeyManager, + realm: Realm, + ) { + val reaction = EmojiReaction().apply { + id = keyManager.newId() + reactionMessageId = reactionMessage.id + targetMessageId = targetMessage?.id ?: 0 + senderAddress = reactionMessage.address + emoji = parsedReaction.emoji + originalMessageText = parsedReaction.originalMessage + threadId = reactionMessage.threadId + patternType = parsedReaction.patternType + } + + realm.insertOrUpdate(reaction) + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + + if (targetMessage != null) { + Timber.i("Saved emoji reaction: ${reaction.emoji} from ${reaction.senderAddress} to message ${targetMessage.id}") + } else { + Timber.w("Saved emoji reaction without target message: ${reaction.emoji} from ${reaction.senderAddress}") + } + } +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt new file mode 100644 index 00000000..cef53759 --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject +import io.realm.annotations.Index +import io.realm.annotations.PrimaryKey + +open class EmojiReaction : RealmObject() { + @PrimaryKey var id: Long = 0 + + /** The message this is a reaction to */ + @Index var targetMessageId: Long = 0 + + /** The reaction message ID itself */ + @Index var reactionMessageId: Long = 0 + + /** The sender's address (phone number) */ + var senderAddress: String = "" + + /** The emoji used in the reaction */ + var emoji: String = "" + + /** The original message text that was reacted to */ + var originalMessageText: String = "" + + /** Thread ID for easier querying */ + @Index var threadId: Long = 0 + + /** + * Pattern type that was matched (for debugging) + * + * for example, "ios" or "google" + */ + var patternType: String = "" +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index 25300368..5c7d5fc8 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -74,6 +74,7 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() + var isEmojiReaction: Boolean = false fun getUri(): Uri { val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt index fde7149b..855a8130 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt @@ -26,6 +26,7 @@ object BubbleUtils { const val TIMESTAMP_THRESHOLD = 10 + // TODO: update to consider emoji reactions fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 7aa6ea93..5e2a0125 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -64,6 +64,7 @@ import dev.octoshrimpy.quik.feature.compose.BubbleUtils.getBubble import dev.octoshrimpy.quik.feature.compose.part.PartsAdapter import dev.octoshrimpy.quik.feature.extensions.isEmojiOnly import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.util.PhoneNumberUtils @@ -71,10 +72,13 @@ import dev.octoshrimpy.quik.util.Preferences import io.reactivex.disposables.Disposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject +import io.realm.Realm import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.* import kotlinx.android.synthetic.main.message_list_item_in.body +import kotlinx.android.synthetic.main.message_list_item_in.reactionText import kotlinx.android.synthetic.main.message_list_item_in.parts +import kotlinx.android.synthetic.main.message_list_item_in.reactions import kotlinx.android.synthetic.main.message_list_item_in.sim import kotlinx.android.synthetic.main.message_list_item_in.simIndex import kotlinx.android.synthetic.main.message_list_item_in.status @@ -389,6 +393,59 @@ class MessagesAdapter @Inject constructor( contextMenuValue = message.id clicks.subscribe(partClicks) // part clicks gets passed back to compose view model } + + bindEmojiReactions(holder, message) + } + + private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { + holder.reactions?.let { reactionsContainer -> + val reactions = getReactionsForMessage(message.id) + val hasReactions = reactions.isNotEmpty() + + if (hasReactions) { + val reactionCounts = reactions.groupBy { it.emoji } + .mapValues { it.value.size } + .toList() + .sortedByDescending { it.second } // Sort by count, most reactions first + + // For now, show just the first (most popular) reaction + val topReaction = reactionCounts.first() + val reactionText = if (topReaction.second == 1) { + topReaction.first + } else { + "${topReaction.first} ${topReaction.second}" + } + + holder.reactionText?.text = reactionText + reactionsContainer.setVisible(true) + makeRoomForEmojis(holder) + } else { + reactionsContainer.setVisible(false) + } + } + } + + private fun makeRoomForEmojis(holder: QkViewHolder) { + val paddingBottom = 21.dpToPx(context) + + // Adjust the container padding + (holder.reactions?.parent as? ViewGroup)?.let { parent -> + parent.setPadding( + parent.paddingLeft, + parent.paddingTop, + parent.paddingRight, + paddingBottom + ) + } + } + + private fun getReactionsForMessage(messageId: Long): List { + return Realm.getDefaultInstance().use { realm -> + realm.where(EmojiReaction::class.java) + .equalTo("targetMessageId", messageId) + .findAll() + .let { realm.copyFromRealm(it) } + } } private fun bindStatus( diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index dc58afd8..79d9288f 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -89,16 +89,19 @@ app:layout_constraintBottom_toBottomOf="@id/body" app:layout_constraintStart_toStartOf="parent" /> - + android:paddingBottom="20dp" + android:clipToPadding="false"> - + + + + + + + + diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index d3c79871..6d30a91f 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -92,7 +92,8 @@ + android:layout_height="wrap_content" + android:clipToPadding="false"> - + android:paddingStart="18dp" + android:paddingBottom="21dp" + android:clipToPadding="false"> + + + + + + + + + + Date: Tue, 26 Aug 2025 16:38:44 -0400 Subject: [PATCH 62/99] cleanup --- .../main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 2f13c09d..a9a99a9e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -37,6 +37,7 @@ import dev.octoshrimpy.quik.mapper.CursorToRecipient import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.ContactGroup import dev.octoshrimpy.quik.model.Conversation +import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber @@ -105,7 +106,7 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) - realm.delete(dev.octoshrimpy.quik.model.EmojiReaction::class.java) + realm.delete(EmojiReaction::class.java) keys.reset() From a2568f165918622609c1965f3fad727b9b147794 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 26 Aug 2025 22:32:22 -0400 Subject: [PATCH 63/99] simplify target matching --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 5aa7f3bb..728ed297 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -78,25 +78,12 @@ object EmojiReactionUtils { .limit(50) // TODO: should we keep this limit? .findAll() - val exactMatch = messages.find { message -> + val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() } - if (exactMatch != null) { - Timber.d("Found exact match for reaction target: message ID ${exactMatch.id}") - return exactMatch - } - - // Try partial match (in case of truncation) - val partialMatch = messages.find { message -> - val text = message.getText(false).trim() - text.isNotEmpty() && ( - text.contains(originalMessageText.trim(), ignoreCase = true) || - originalMessageText.trim().contains(text, ignoreCase = true) - ) - } - if (partialMatch != null) { - Timber.d("Found partial match for reaction target: message ID ${partialMatch.id}") - return partialMatch + if (match != null) { + Timber.d("Found match for reaction target: message ID ${match.id}") + return match } Timber.w("No target message found for reaction text: '$originalMessageText'") From 0c111b2ad270b71fe3129ec1fe1a6174ccdb2ecb Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 17:47:40 -0400 Subject: [PATCH 64/99] fix default msg padding --- presentation/src/main/res/layout/message_list_item_in.xml | 1 - presentation/src/main/res/layout/message_list_item_out.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 79d9288f..52da388a 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -93,7 +93,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:paddingBottom="20dp" android:clipToPadding="false"> Date: Wed, 27 Aug 2025 17:47:45 -0400 Subject: [PATCH 65/99] handle iOS tapbacks --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 728ed297..7ed1ec78 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -29,6 +29,15 @@ data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, v object EmojiReactionUtils { + val iosTapbacks = mapOf( + Regex("^Loved \u201C(.+?)\u201D$") to "❤️", + Regex("^Liked \u201C(.+?)\u201D$") to "👍", + Regex("^Disliked \u201C(.+?)\u201D$") to "👎", + Regex("^Laughed at \u201C(.+?)\u201D$") to "😂", + Regex("^Emphasized \u201C(.+?)\u201D$") to "‼️", + Regex("^Questioned \u201C(.+?)\u201D$") to "❓", + ) + fun parseEmojiReaction(body: String): ParsedEmojiReaction? { // Log the raw message with unicode escapes for debugging val escapedBody = body.map { char -> @@ -54,6 +63,15 @@ object EmojiReactionUtils { return ParsedEmojiReaction(emoji, originalMessage, "ios") } + for ((pattern, emoji) in iosTapbacks) { + val iosTapbackMatch = pattern.find(body) + if (iosTapbackMatch != null) { + val originalMessage = iosTapbackMatch.groupValues[1] + Timber.d("iOS tapback detected - emoji: '$emoji', original: '$originalMessage'") + return ParsedEmojiReaction(emoji, originalMessage, "ios") + } + } + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") val googleMatch = googleMessagesPattern.find(body) From 465a6ee739d243bfac0759c18b7ad08b1973bf8d Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 18:45:08 -0400 Subject: [PATCH 66/99] handle removals --- .../QKSMS/repository/SyncRepositoryImpl.kt | 1 + .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 132 +++++++++++++----- .../com/moez/QKSMS/model/EmojiReaction.kt | 7 - 3 files changed, 96 insertions(+), 44 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index a9a99a9e..52d1f51c 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -218,6 +218,7 @@ class SyncRepositoryImpl @Inject constructor( .isNotEmpty("parts.text") .endGroup() .endGroup() + .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly .findAll() allMessages.forEach { message -> diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 7ed1ec78..812e14e6 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -25,17 +25,46 @@ import io.realm.Realm import io.realm.Sort import timber.log.Timber -data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val patternType: String) +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) object EmojiReactionUtils { - val iosTapbacks = mapOf( - Regex("^Loved \u201C(.+?)\u201D$") to "❤️", - Regex("^Liked \u201C(.+?)\u201D$") to "👍", - Regex("^Disliked \u201C(.+?)\u201D$") to "👎", - Regex("^Laughed at \u201C(.+?)\u201D$") to "😂", - Regex("^Emphasized \u201C(.+?)\u201D$") to "‼️", - Regex("^Questioned \u201C(.+?)\u201D$") to "❓", + private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { + return { match -> + ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) + } + } + + val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( + // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], ) + }, + Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> + if (match.groupValues[1] == "with a sticker") + null + else + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), + Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), + Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), + Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), + Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), + Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), + ) + + val removalPatterns: Map ParsedEmojiReaction?> = mapOf( + // TODO: google messages removal + Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), + Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), + Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), + Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), + Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), + Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, ) fun parseEmojiReaction(body: String): ParsedEmojiReaction? { @@ -46,40 +75,35 @@ object EmojiReactionUtils { else -> "\\u${char.code.toString(16).padStart(4, '0')}" } }.joinToString("") - Timber.v("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? + Timber.d("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? - val iosPattern = Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") - val iosMatch = iosPattern.find(body) - if (iosMatch != null) { - val emoji = iosMatch.groupValues[1] - val originalMessage = iosMatch.groupValues[2] + val removal = parseRemoval(body) + if (removal != null) return removal - if (emoji == "with a sticker") { - Timber.d("Skipping sticker reaction: '$originalMessage'") - return null - } + for ((pattern, parser) in reactionPatterns) { + val match = pattern.find(body) + if (match == null) continue; - Timber.d("iOS pattern detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "ios") + val result = parser(match) + if (result == null) continue + + Timber.d("Reaction found: $result") + return result } - for ((pattern, emoji) in iosTapbacks) { - val iosTapbackMatch = pattern.find(body) - if (iosTapbackMatch != null) { - val originalMessage = iosTapbackMatch.groupValues[1] - Timber.d("iOS tapback detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "ios") - } - } + return null + } - // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - val googleMessagesPattern = Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") - val googleMatch = googleMessagesPattern.find(body) - if (googleMatch != null) { - val emoji = googleMatch.groupValues[1] - val originalMessage = googleMatch.groupValues[2] - Timber.d("Google Messages pattern detected - emoji: '$emoji', original: '$originalMessage'") - return ParsedEmojiReaction(emoji, originalMessage, "google") + private fun parseRemoval(body: String): ParsedEmojiReaction? { + for ((pattern, parser) in removalPatterns) { + val match = pattern.find(body) + if (match == null) continue; + + val result = parser(match) + if (result == null) continue + + Timber.d("Reaction found: $result") + return result } return null @@ -108,6 +132,36 @@ object EmojiReactionUtils { return null } + fun removeEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) { + if (targetMessage == null) { + Timber.w("Cannot remove emoji reaction: no target message found for '${parsedReaction.originalMessage}'") + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + return + } + + val existingReaction = realm.where(EmojiReaction::class.java) + .equalTo("targetMessageId", targetMessage.id) + .equalTo("senderAddress", reactionMessage.address) + .equalTo("emoji", parsedReaction.emoji) + .findFirst() + + if (existingReaction != null) { + existingReaction.deleteFromRealm() + Timber.d("Removed emoji reaction: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + } else { + Timber.w("No existing emoji reaction found to remove: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + } + + reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) + } + fun saveEmojiReaction( reactionMessage: Message, parsedReaction: ParsedEmojiReaction, @@ -115,6 +169,11 @@ object EmojiReactionUtils { keyManager: KeyManager, realm: Realm, ) { + if (parsedReaction.isRemoval) { + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) + return + } + val reaction = EmojiReaction().apply { id = keyManager.newId() reactionMessageId = reactionMessage.id @@ -123,7 +182,6 @@ object EmojiReactionUtils { emoji = parsedReaction.emoji originalMessageText = parsedReaction.originalMessage threadId = reactionMessage.threadId - patternType = parsedReaction.patternType } realm.insertOrUpdate(reaction) diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt index cef53759..04d8ca0f 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -42,11 +42,4 @@ open class EmojiReaction : RealmObject() { /** Thread ID for easier querying */ @Index var threadId: Long = 0 - - /** - * Pattern type that was matched (for debugging) - * - * for example, "ios" or "google" - */ - var patternType: String = "" } \ No newline at end of file From 2b093612881f82e72f77bd08d823f3521e1846b6 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:31:43 -0400 Subject: [PATCH 67/99] remove pii logs --- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 812e14e6..a1660d01 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -68,15 +68,6 @@ object EmojiReactionUtils { ) fun parseEmojiReaction(body: String): ParsedEmojiReaction? { - // Log the raw message with unicode escapes for debugging - val escapedBody = body.map { char -> - when (char.code) { - in 0x20..0x7E -> char.toString() // printable ASCII - else -> "\\u${char.code.toString(16).padStart(4, '0')}" - } - }.joinToString("") - Timber.d("Parsing body: \"$escapedBody\"") // TODO: are we okay logging SMS content? - val removal = parseRemoval(body) if (removal != null) return removal @@ -132,14 +123,14 @@ object EmojiReactionUtils { return null } - fun removeEmojiReaction( + private fun removeEmojiReaction( reactionMessage: Message, - parsedReaction: ParsedEmojiReaction, + reaction: ParsedEmojiReaction, targetMessage: Message?, realm: Realm, ) { if (targetMessage == null) { - Timber.w("Cannot remove emoji reaction: no target message found for '${parsedReaction.originalMessage}'") + Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") reactionMessage.isEmojiReaction = true realm.insertOrUpdate(reactionMessage) return @@ -148,14 +139,14 @@ object EmojiReactionUtils { val existingReaction = realm.where(EmojiReaction::class.java) .equalTo("targetMessageId", targetMessage.id) .equalTo("senderAddress", reactionMessage.address) - .equalTo("emoji", parsedReaction.emoji) + .equalTo("emoji", reaction.emoji) .findFirst() if (existingReaction != null) { existingReaction.deleteFromRealm() - Timber.d("Removed emoji reaction: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + Timber.d("Removed emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { - Timber.w("No existing emoji reaction found to remove: ${parsedReaction.emoji} from ${reactionMessage.address} to message ${targetMessage.id}") + Timber.w("No existing emoji reaction found to remove: ${reaction.emoji} to message ${targetMessage.id}") } reactionMessage.isEmojiReaction = true @@ -189,9 +180,9 @@ object EmojiReactionUtils { realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { - Timber.i("Saved emoji reaction: ${reaction.emoji} from ${reaction.senderAddress} to message ${targetMessage.id}") + Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { - Timber.w("Saved emoji reaction without target message: ${reaction.emoji} from ${reaction.senderAddress}") + Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") } } -} \ No newline at end of file +} From dfe83a3b48088c6fb57f7a407575f008ffe52b87 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:37:12 -0400 Subject: [PATCH 68/99] newlines --- domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt index 04d8ca0f..10451625 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -42,4 +42,4 @@ open class EmojiReaction : RealmObject() { /** Thread ID for easier querying */ @Index var threadId: Long = 0 -} \ No newline at end of file +} From 9b2ae330b96b76ebce127738f90f30e600428432 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:37:16 -0400 Subject: [PATCH 69/99] cleanup --- .../main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 1 - presentation/src/main/res/layout/message_list_item_out.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 5e2a0125..2858b574 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -428,7 +428,6 @@ class MessagesAdapter @Inject constructor( private fun makeRoomForEmojis(holder: QkViewHolder) { val paddingBottom = 21.dpToPx(context) - // Adjust the container padding (holder.reactions?.parent as? ViewGroup)?.let { parent -> parent.setPadding( parent.paddingLeft, diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index a6402f83..6ae28a27 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -186,7 +186,7 @@ android:paddingTop="4dp" android:paddingEnd="8dp" android:paddingBottom="4dp" - android:text="👍 1" + android:text="👍" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp" /> From 8a90923d7bbba859e332ab084301b46a79c3e441 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 27 Aug 2025 21:59:50 -0400 Subject: [PATCH 70/99] Fix clipping a bit --- presentation/src/main/res/layout/message_list_item_out.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 6ae28a27..6c327730 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -150,7 +150,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingStart="18dp" - android:clipToPadding="false"> + android:clipToPadding="false" + android:clipChildren="false"> Date: Wed, 27 Aug 2025 23:15:23 -0400 Subject: [PATCH 71/99] Fix message grouping --- .../moez/QKSMS/migration/QkRealmMigration.kt | 4 ++-- .../com/moez/QKSMS/util/EmojiReactionUtils.kt | 17 ++++++++--------- .../java/com/moez/QKSMS/model/EmojiReaction.kt | 3 --- .../main/java/com/moez/QKSMS/model/Message.kt | 4 ++++ .../moez/QKSMS/feature/compose/BubbleUtils.kt | 2 +- .../QKSMS/feature/compose/MessagesAdapter.kt | 13 +------------ 6 files changed, 16 insertions(+), 27 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 5b0da597..9e291652 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -254,9 +254,8 @@ class QkRealmMigration @Inject constructor( } if (version == 12L) { - realm.schema.create("EmojiReaction") + val emojiReactionTable = realm.schema.create("EmojiReaction") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) - .addField("targetMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) .addField("emoji", String::class.java, FieldAttribute.REQUIRED) @@ -266,6 +265,7 @@ class QkRealmMigration @Inject constructor( realm.schema.get("Message") ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) + ?.addRealmListField("emojiReactions", emojiReactionTable) ?.transform { msg -> msg.setBoolean("isEmojiReaction", false) } diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index a1660d01..89ebe5de 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -78,7 +78,7 @@ object EmojiReactionUtils { val result = parser(match) if (result == null) continue - Timber.d("Reaction found: $result") + Timber.d("Reaction found with ${result.emoji}") return result } @@ -93,7 +93,7 @@ object EmojiReactionUtils { val result = parser(match) if (result == null) continue - Timber.d("Reaction found: $result") + Timber.d("Removal found with ${result.emoji}") return result } @@ -136,11 +136,9 @@ object EmojiReactionUtils { return } - val existingReaction = realm.where(EmojiReaction::class.java) - .equalTo("targetMessageId", targetMessage.id) - .equalTo("senderAddress", reactionMessage.address) - .equalTo("emoji", reaction.emoji) - .findFirst() + val existingReaction = targetMessage.emojiReactions.find { candidate -> + candidate.senderAddress == reactionMessage.address && candidate.emoji == reaction.emoji + } if (existingReaction != null) { existingReaction.deleteFromRealm() @@ -168,18 +166,19 @@ object EmojiReactionUtils { val reaction = EmojiReaction().apply { id = keyManager.newId() reactionMessageId = reactionMessage.id - targetMessageId = targetMessage?.id ?: 0 senderAddress = reactionMessage.address emoji = parsedReaction.emoji originalMessageText = parsedReaction.originalMessage threadId = reactionMessage.threadId } - realm.insertOrUpdate(reaction) + reactionMessage.isEmojiReaction = true realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { + targetMessage.emojiReactions.add(reaction) + Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt index 10451625..437a2809 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiReaction.kt @@ -25,9 +25,6 @@ import io.realm.annotations.PrimaryKey open class EmojiReaction : RealmObject() { @PrimaryKey var id: Long = 0 - /** The message this is a reaction to */ - @Index var targetMessageId: Long = 0 - /** The reaction message ID itself */ @Index var reactionMessageId: Long = 0 diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index 5c7d5fc8..90f70ab8 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -26,6 +26,7 @@ import android.provider.Telephony.Sms import dev.octoshrimpy.quik.extensions.joinTo import io.realm.RealmList import io.realm.RealmObject +import io.realm.RealmResults import io.realm.annotations.Index import io.realm.annotations.PrimaryKey @@ -74,7 +75,10 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() + /** is this message a reaction to another message? */ var isEmojiReaction: Boolean = false + /** emoji reactions to this message */ + val emojiReactions: RealmList = RealmList() fun getUri(): Uri { val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt index 855a8130..b5d2c550 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/BubbleUtils.kt @@ -26,9 +26,9 @@ object BubbleUtils { const val TIMESTAMP_THRESHOLD = 10 - // TODO: update to consider emoji reactions fun canGroup(message: Message, other: Message?): Boolean { if (other == null) return false + if (message.emojiReactions.isNotEmpty() || other.emojiReactions.isNotEmpty()) return false val diff = TimeUnit.MILLISECONDS.toMinutes(Math.abs(message.date - other.date)) return message.compareSender(other) && diff < TIMESTAMP_THRESHOLD } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 2858b574..cb2dfb0b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -64,7 +64,6 @@ import dev.octoshrimpy.quik.feature.compose.BubbleUtils.getBubble import dev.octoshrimpy.quik.feature.compose.part.PartsAdapter import dev.octoshrimpy.quik.feature.extensions.isEmojiOnly import dev.octoshrimpy.quik.model.Conversation -import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.util.PhoneNumberUtils @@ -72,7 +71,6 @@ import dev.octoshrimpy.quik.util.Preferences import io.reactivex.disposables.Disposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import io.realm.Realm import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.* import kotlinx.android.synthetic.main.message_list_item_in.body @@ -399,7 +397,7 @@ class MessagesAdapter @Inject constructor( private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { holder.reactions?.let { reactionsContainer -> - val reactions = getReactionsForMessage(message.id) + val reactions = message.emojiReactions val hasReactions = reactions.isNotEmpty() if (hasReactions) { @@ -438,15 +436,6 @@ class MessagesAdapter @Inject constructor( } } - private fun getReactionsForMessage(messageId: Long): List { - return Realm.getDefaultInstance().use { realm -> - realm.where(EmojiReaction::class.java) - .equalTo("targetMessageId", messageId) - .findAll() - .let { realm.copyFromRealm(it) } - } - } - private fun bindStatus( holder: QkViewHolder, bodyTextTruncated: Boolean, From 46ec29546f57f3fafc215af26ef58d5d6dd566d1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 17:30:28 -0400 Subject: [PATCH 72/99] Parse google messages emoji removal --- .../com/moez/QKSMS/migration/QkRealmMigration.kt | 1 - .../java/com/moez/QKSMS/util/EmojiReactionUtils.kt | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 9e291652..442eeae3 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -261,7 +261,6 @@ class QkRealmMigration @Inject constructor( .addField("emoji", String::class.java, FieldAttribute.REQUIRED) .addField("originalMessageText", String::class.java, FieldAttribute.REQUIRED) .addField("threadId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) - .addField("patternType", String::class.java, FieldAttribute.REQUIRED) realm.schema.get("Message") ?.addField("isEmojiReaction", Boolean::class.java, FieldAttribute.REQUIRED) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt index 89ebe5de..251a69bd 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt @@ -36,16 +36,18 @@ object EmojiReactionUtils { } val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], ) + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> if (match.groupValues[1] == "with a sticker") null else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) }, + // iOS tapbacks Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), @@ -55,13 +57,18 @@ object EmojiReactionUtils { ) val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // TODO: google messages removal + // Google Messages + Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + // iOS tapbacks Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) }, From b4bc87a479a07e32cd3bb318aa66016c585d0fb4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:07:33 -0400 Subject: [PATCH 73/99] Fix emoji clipping --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 2 +- presentation/src/main/res/layout/message_list_item_in.xml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index cb2dfb0b..fe8c2854 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -424,7 +424,7 @@ class MessagesAdapter @Inject constructor( } private fun makeRoomForEmojis(holder: QkViewHolder) { - val paddingBottom = 21.dpToPx(context) + val paddingBottom = 25.dpToPx(context) (holder.reactions?.parent as? ViewGroup)?.let { parent -> parent.setPadding( diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 52da388a..0006b0dd 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -93,7 +93,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:clipToPadding="false"> + android:clipToPadding="false" + android:clipChildren="false" + android:paddingEnd="4dp" + android:paddingStart="4dp"> Date: Tue, 2 Sep 2025 18:45:52 -0400 Subject: [PATCH 74/99] move emoji reaction code to repo and impl --- .../EmojiReactionRepositoryImpl.kt} | 115 ++++++++++-------- .../QKSMS/repository/MessageRepositoryImpl.kt | 9 +- .../QKSMS/repository/SyncRepositoryImpl.kt | 18 ++- .../repository/EmojiReactionRepository.kt | 19 +++ .../com/moez/QKSMS/injection/AppModule.kt | 5 + 5 files changed, 97 insertions(+), 69 deletions(-) rename data/src/main/java/com/moez/QKSMS/{util/EmojiReactionUtils.kt => repository/EmojiReactionRepositoryImpl.kt} (90%) create mode 100644 domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt similarity index 90% rename from data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt rename to data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 251a69bd..fd2eae4a 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiReactionUtils.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -16,65 +16,25 @@ * You should have received a copy of the GNU General Public License * along with QUIK. If not, see . */ -package dev.octoshrimpy.quik.util +package dev.octoshrimpy.quik.repository import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message +import dev.octoshrimpy.quik.repository.EmojiReactionUtils.reactionPatterns +import dev.octoshrimpy.quik.repository.EmojiReactionUtils.removalPatterns import io.realm.Realm import io.realm.Sort import timber.log.Timber +import javax.inject.Inject +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.iterator -data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) - -object EmojiReactionUtils { - - private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { - return { match -> - ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) - } - } - - val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS - Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> - if (match.groupValues[1] == "with a sticker") - null - else - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS tapbacks - Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), - Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), - Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), - Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), - Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), - Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), - ) - - val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - // iOS tapbacks - Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), - Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), - Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), - Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), - Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), - Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), - // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above - Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - ) - - fun parseEmojiReaction(body: String): ParsedEmojiReaction? { +class EmojiReactionRepositoryImpl @Inject constructor( + private val keyManager: KeyManager +) : EmojiReactionRepository { + override fun parseEmojiReaction(body: String): ParsedEmojiReaction? { val removal = parseRemoval(body) if (removal != null) return removal @@ -111,7 +71,7 @@ object EmojiReactionUtils { * Search for messages in the same thread with matching text content * We'll search recent messages first (within reasonable time window) */ - fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) .sort("date", Sort.DESCENDING) @@ -158,11 +118,10 @@ object EmojiReactionUtils { realm.insertOrUpdate(reactionMessage) } - fun saveEmojiReaction( + override fun saveEmojiReaction( reactionMessage: Message, parsedReaction: ParsedEmojiReaction, targetMessage: Message?, - keyManager: KeyManager, realm: Realm, ) { if (parsedReaction.isRemoval) { @@ -191,4 +150,52 @@ object EmojiReactionUtils { Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") } } + +} + +object EmojiReactionUtils { + private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { + return { match -> + ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) + } + } + + val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( + // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 + Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + // iOS + Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> + if (match.groupValues[1] == "with a sticker") + null + else + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + }, + // iOS tapbacks + Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), + Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), + Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), + Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), + Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), + Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), + ) + + val removalPatterns: Map ParsedEmojiReaction?> = mapOf( + // Google Messages + Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + // iOS tapbacks + Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), + Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), + Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), + Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), + Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), + Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), + // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above + Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + }, + ) } diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 49d386ee..068b579d 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -57,7 +57,6 @@ import dev.octoshrimpy.quik.receiver.SendSmsReceiver import dev.octoshrimpy.quik.receiver.SmsDeliveredReceiver import dev.octoshrimpy.quik.receiver.SmsSentReceiver import dev.octoshrimpy.quik.util.ImageUtils -import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.Preferences import dev.octoshrimpy.quik.util.tryOrNull @@ -79,6 +78,7 @@ open class MessageRepositoryImpl @Inject constructor( private val phoneNumberUtils: PhoneNumberUtils, private val prefs: Preferences, private val syncRepository: SyncRepository, + private val reactions: EmojiReactionRepository, ) : MessageRepository { companion object { @@ -765,19 +765,18 @@ open class MessageRepositoryImpl @Inject constructor( } managedMessage?.let { savedMessage -> - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(body) + val parsedReaction = reactions.parseEmojiReaction(body) if (parsedReaction != null) { - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( savedMessage.threadId, parsedReaction.originalMessage, realm ) realm.executeTransaction { - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( savedMessage, parsedReaction, targetMessage, - messageIds, realm, ) } diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index a7e8fe9f..5241c957 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -45,7 +45,6 @@ import dev.octoshrimpy.quik.model.MmsPart import dev.octoshrimpy.quik.model.PhoneNumber import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.model.SyncLog -import dev.octoshrimpy.quik.util.EmojiReactionUtils import dev.octoshrimpy.quik.util.PhoneNumberUtils import dev.octoshrimpy.quik.util.tryOrNull import io.reactivex.subjects.BehaviorSubject @@ -70,7 +69,8 @@ class SyncRepositoryImpl @Inject constructor( private val cursorToContactGroupMember: CursorToContactGroupMember, private val keys: KeyManager, private val phoneNumberUtils: PhoneNumberUtils, - private val rxPrefs: RxSharedPreferences + private val rxPrefs: RxSharedPreferences, + private val reactions: EmojiReactionRepository, ) : SyncRepository { override val syncProgress: Subject = @@ -248,18 +248,17 @@ class SyncRepositoryImpl @Inject constructor( allMessages.forEach { message -> val text = message.getText(false) - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + val parsedReaction = reactions.parseEmojiReaction(text) if (parsedReaction != null) { - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( message.threadId, parsedReaction.originalMessage, realm ) - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( message, parsedReaction, targetMessage, - keys, realm, ) } @@ -326,20 +325,19 @@ class SyncRepositoryImpl @Inject constructor( insertOrUpdate() val text = getText(false) - val parsedReaction = EmojiReactionUtils.parseEmojiReaction(text) + val parsedReaction = reactions.parseEmojiReaction(text) if (parsedReaction != null) { Realm.getDefaultInstance().use { realm -> - val targetMessage = EmojiReactionUtils.findTargetMessage( + val targetMessage = reactions.findTargetMessage( threadId, parsedReaction.originalMessage, realm ) realm.executeTransaction { - EmojiReactionUtils.saveEmojiReaction( + reactions.saveEmojiReaction( this, parsedReaction, targetMessage, - keys, realm, ) } diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt new file mode 100644 index 00000000..d327863c --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -0,0 +1,19 @@ +package dev.octoshrimpy.quik.repository + +import dev.octoshrimpy.quik.model.Message +import io.realm.Realm + +data class ParsedEmojiReaction(val emoji: String, val originalMessage: String, val isRemoval: Boolean = false) + +interface EmojiReactionRepository { + fun parseEmojiReaction(body: String): ParsedEmojiReaction? + + fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? + + fun saveEmojiReaction( + reactionMessage: Message, + parsedReaction: ParsedEmojiReaction, + targetMessage: Message?, + realm: Realm, + ) +} \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt index 8a1d35b2..8d52fe2f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt +++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt @@ -81,6 +81,8 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.repository.ContactRepositoryImpl import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.ConversationRepositoryImpl +import dev.octoshrimpy.quik.repository.EmojiReactionRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepositoryImpl import dev.octoshrimpy.quik.repository.MessageContentFilterRepository import dev.octoshrimpy.quik.repository.MessageContentFilterRepositoryImpl import dev.octoshrimpy.quik.repository.MessageRepository @@ -219,6 +221,9 @@ class AppModule(private var application: Application) { @Provides fun provideSyncRepository(repository: SyncRepositoryImpl): SyncRepository = repository + @Provides + fun provideEmojiReactionRepository(repository: EmojiReactionRepositoryImpl): EmojiReactionRepository = repository + // worker factory @Provides fun provideWorkerFactory(workerFactory: InjectionWorkerFactory): WorkerFactory = workerFactory From fc70fe7f58bfefa7230e77a7026cebd15e0c8cd8 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:49:06 -0400 Subject: [PATCH 75/99] search all messages as emoji targets and log time taken --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index fd2eae4a..8280ee8f 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -72,11 +72,14 @@ class EmojiReactionRepositoryImpl @Inject constructor( * We'll search recent messages first (within reasonable time window) */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + // log time taken + val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) .sort("date", Sort.DESCENDING) - .limit(50) // TODO: should we keep this limit? .findAll() + val endTime = System.currentTimeMillis() + Timber.d("Found ${messages.size} messages as emoji targets in ${endTime - startTime}ms") val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() From dbba9c44c9b8f86f8331ab1e4eb4c55db275b97e Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 18:53:39 -0400 Subject: [PATCH 76/99] cleanup --- domain/src/main/java/com/moez/QKSMS/model/Message.kt | 1 - .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index 90f70ab8..5f516eeb 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -26,7 +26,6 @@ import android.provider.Telephony.Sms import dev.octoshrimpy.quik.extensions.joinTo import io.realm.RealmList import io.realm.RealmObject -import io.realm.RealmResults import io.realm.annotations.Index import io.realm.annotations.PrimaryKey diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index fe8c2854..a9cc89f1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -392,10 +392,10 @@ class MessagesAdapter @Inject constructor( clicks.subscribe(partClicks) // part clicks gets passed back to compose view model } - bindEmojiReactions(holder, message) + showEmojiReactions(holder, message) } - private fun bindEmojiReactions(holder: QkViewHolder, message: Message) { + private fun showEmojiReactions(holder: QkViewHolder, message: Message) { holder.reactions?.let { reactionsContainer -> val reactions = message.emojiReactions val hasReactions = reactions.isNotEmpty() From 50c6e08beb5f314ade39509a2f0265aa4910b9e7 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 19:41:04 -0400 Subject: [PATCH 77/99] Parse all emoji reactions on migration --- .../moez/QKSMS/migration/QkRealmMigration.kt | 9 ++-- .../repository/EmojiReactionRepositoryImpl.kt | 52 ++++++++++++++++--- .../QKSMS/repository/SyncRepositoryImpl.kt | 34 +----------- .../com/moez/QKSMS/model/EmojiSyncNeeded.kt | 7 +++ .../repository/EmojiReactionRepository.kt | 2 + .../moez/QKSMS/feature/main/MainViewModel.kt | 12 +++++ 6 files changed, 73 insertions(+), 43 deletions(-) create mode 100644 domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 88b79cc9..86668d9b 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -32,7 +32,7 @@ import javax.inject.Inject class QkRealmMigration @Inject constructor( private val cursorToContact: CursorToContactImpl, - private val prefs: Preferences + private val prefs: Preferences, ) : RealmMigration { companion object { @@ -257,7 +257,7 @@ class QkRealmMigration @Inject constructor( } if (version == 13L) { - val emojiReactionTable = realm.schema.create("EmojiReaction") + val emojiReactionTable = realm.schema.create("EmojiReaction") .addField("id", Long::class.java, FieldAttribute.PRIMARY_KEY, FieldAttribute.REQUIRED) .addField("reactionMessageId", Long::class.java, FieldAttribute.INDEXED, FieldAttribute.REQUIRED) .addField("senderAddress", String::class.java, FieldAttribute.REQUIRED) @@ -272,7 +272,10 @@ class QkRealmMigration @Inject constructor( msg.setBoolean("isEmojiReaction", false) } - // TODO: scan for past emoji reaction messages + realm.schema.create("EmojiSyncNeeded") + .addField("createdAt", Long::class.java, FieldAttribute.REQUIRED) + + realm.createObject("EmojiSyncNeeded") version++ } diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 8280ee8f..51b834ba 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -27,9 +27,6 @@ import io.realm.Realm import io.realm.Sort import timber.log.Timber import javax.inject.Inject -import kotlin.collections.component1 -import kotlin.collections.component2 -import kotlin.collections.iterator class EmojiReactionRepositoryImpl @Inject constructor( private val keyManager: KeyManager @@ -72,7 +69,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( * We'll search recent messages first (within reasonable time window) */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { - // log time taken val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) @@ -102,7 +98,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) return } @@ -118,7 +113,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( } reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) } override fun saveEmojiReaction( @@ -143,7 +137,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm.insertOrUpdate(reaction) reactionMessage.isEmojiReaction = true - realm.insertOrUpdate(reactionMessage) if (targetMessage != null) { targetMessage.emojiReactions.add(reaction) @@ -154,6 +147,51 @@ class EmojiReactionRepositoryImpl @Inject constructor( } } + override fun deleteAndReparseAllEmojiReactions(realm: Realm) { + val startTime = System.currentTimeMillis() + + realm.delete(EmojiReaction::class.java) + realm.where(Message::class.java).findAll().map { + it.isEmojiReaction = false + } + + val allMessages = realm.where(Message::class.java) + .beginGroup() + .beginGroup() + .equalTo("type", "sms") + .isNotEmpty("body") + .endGroup() + .or() + .beginGroup() + .equalTo("type", "mms") + .isNotEmpty("parts.text") + .endGroup() + .endGroup() + .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly + .findAll() + + allMessages.forEach { message -> + val text = message.getText(false) + val parsedReaction = parseEmojiReaction(text) + if (parsedReaction != null) { + val targetMessage = findTargetMessage( + message.threadId, + parsedReaction.originalMessage, + realm + ) + saveEmojiReaction( + message, + parsedReaction, + targetMessage, + realm, + ) + } + } + + val endTime = System.currentTimeMillis() + Timber.d("Deleted and reparsed all emoji reactions in ${endTime - startTime}ms") + } + } object EmojiReactionUtils { diff --git a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt index 5241c957..78ca1636 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/SyncRepositoryImpl.kt @@ -231,38 +231,7 @@ class SyncRepositoryImpl @Inject constructor( syncProgress.onNext(SyncRepository.SyncProgress.Running(0, 0, true)) // Now that we have all the messages, we can scan for emoji reactions - val allMessages = realm.where(Message::class.java) - .beginGroup() - .beginGroup() - .equalTo("type", "sms") - .isNotEmpty("body") - .endGroup() - .or() - .beginGroup() - .equalTo("type", "mms") - .isNotEmpty("parts.text") - .endGroup() - .endGroup() - .sort("date", Sort.ASCENDING) // parse oldest to newest to handle reactions & removals properly - .findAll() - - allMessages.forEach { message -> - val text = message.getText(false) - val parsedReaction = reactions.parseEmojiReaction(text) - if (parsedReaction != null) { - val targetMessage = reactions.findTargetMessage( - message.threadId, - parsedReaction.originalMessage, - realm - ) - reactions.saveEmojiReaction( - message, - parsedReaction, - targetMessage, - realm, - ) - } - } + reactions.deleteAndReparseAllEmojiReactions(realm) realm.insert(SyncLog()) }, { @@ -436,7 +405,6 @@ class SyncRepositoryImpl @Inject constructor( realm.delete(Message::class.java) realm.delete(MmsPart::class.java) realm.delete(Recipient::class.java) - realm.delete(EmojiReaction::class.java) } } diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt new file mode 100644 index 00000000..8515f1dc --- /dev/null +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -0,0 +1,7 @@ +package dev.octoshrimpy.quik.model + +import io.realm.RealmObject + +open class EmojiSyncNeeded : RealmObject() { + var createdAt: Long = System.currentTimeMillis() +} \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index d327863c..dde4061f 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -16,4 +16,6 @@ interface EmojiReactionRepository { targetMessage: Message?, realm: Realm, ) + + fun deleteAndReparseAllEmojiReactions(realm: Realm) } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index 36a4d96a..cdfe7194 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -42,8 +42,10 @@ import dev.octoshrimpy.quik.manager.BillingManager import dev.octoshrimpy.quik.manager.ChangelogManager import dev.octoshrimpy.quik.manager.PermissionManager import dev.octoshrimpy.quik.manager.RatingManager +import dev.octoshrimpy.quik.model.EmojiSyncNeeded import dev.octoshrimpy.quik.model.SyncLog import dev.octoshrimpy.quik.repository.ConversationRepository +import dev.octoshrimpy.quik.repository.EmojiReactionRepository import dev.octoshrimpy.quik.repository.MessageRepository import dev.octoshrimpy.quik.repository.SyncRepository import dev.octoshrimpy.quik.util.Preferences @@ -79,6 +81,7 @@ class MainViewModel @Inject constructor( private val permissionManager: PermissionManager, private val prefs: Preferences, private val ratingManager: RatingManager, + private val reactions: EmojiReactionRepository, private val syncContacts: SyncContacts, private val syncMessages: SyncMessages ) : QkViewModel( @@ -121,6 +124,15 @@ class MainViewModel @Inject constructor( syncMessages.execute(Unit) } + // This is only used when we update to a version that newly supports emoji reactions + Realm.getDefaultInstance().executeTransactionAsync { realm -> + val emojiSyncNeeded = realm.where(EmojiSyncNeeded::class.java).findFirst() + if (emojiSyncNeeded != null) { + reactions.deleteAndReparseAllEmojiReactions(realm) + emojiSyncNeeded.deleteFromRealm() + } + } + // Sync contacts when we detect a change if (permissionManager.hasContacts()) { disposables += contactAddedListener.listen() From d3eaa4fb2e200e7ff937b9319bcc71c232d02f65 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Tue, 2 Sep 2025 22:54:00 -0400 Subject: [PATCH 78/99] cleanup --- .../moez/QKSMS/migration/QkRealmMigration.kt | 2 +- .../repository/EmojiReactionRepositoryImpl.kt | 2 +- .../com/moez/QKSMS/model/EmojiSyncNeeded.kt | 18 ++++++++++++++++++ .../repository/EmojiReactionRepository.kt | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt index 86668d9b..7f221a65 100644 --- a/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt +++ b/data/src/main/java/com/moez/QKSMS/migration/QkRealmMigration.kt @@ -32,7 +32,7 @@ import javax.inject.Inject class QkRealmMigration @Inject constructor( private val cursorToContact: CursorToContactImpl, - private val prefs: Preferences, + private val prefs: Preferences ) : RealmMigration { companion object { diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 51b834ba..2b077e18 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -66,7 +66,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( /** * Search for messages in the same thread with matching text content - * We'll search recent messages first (within reasonable time window) + * We'll search recent messages first */ override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { val startTime = System.currentTimeMillis() diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt index 8515f1dc..cb9013f6 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ package dev.octoshrimpy.quik.model import io.realm.RealmObject diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index dde4061f..15f1fdd0 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2025 + * + * This file is part of QUIK. + * + * QUIK is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QUIK is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QUIK. If not, see . + */ package dev.octoshrimpy.quik.repository import dev.octoshrimpy.quik.model.Message From f6019e1d8026e0f72bfa7a1ae3dab0e4859891a1 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 3 Sep 2025 22:21:04 -0400 Subject: [PATCH 79/99] Localize emoji patterns --- data/build.gradle | 1 + data/src/main/assets/emojis/en.json | 25 ++++ .../QKSMS/repository/EmojiPatternStrings.kt | 31 ++++ .../repository/EmojiReactionRepositoryImpl.kt | 141 +++++++++++------- presentation/build.gradle | 7 + 5 files changed, 152 insertions(+), 53 deletions(-) create mode 100644 data/src/main/assets/emojis/en.json create mode 100644 data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt diff --git a/data/build.gradle b/data/build.gradle index 7077cecd..1819170d 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -81,6 +81,7 @@ dependencies { implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" + kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version" implementation "com.squareup.okhttp3:okhttp:$okhttp3_version" implementation 'io.michaelrocks:libphonenumber-android:8.13.47' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json new file mode 100644 index 00000000..402dbdb1 --- /dev/null +++ b/data/src/main/assets/emojis/en.json @@ -0,0 +1,25 @@ +{ + "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$", + "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$", + + "emoji_reaction_ios_generic_added": "^Reacted (.+?) to \u201C(.+?)\u201D$", + "emoji_reaction_ios_generic_removed": "^Removed (.+?) from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_heart_added": "^Loved \u201C(.+?)\u201D$", + "emoji_reaction_ios_heart_removed": "^Removed a heart from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_like_added": "^Liked \u201C(.+?)\u201D$", + "emoji_reaction_ios_like_removed": "^Removed a like from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_dislike_added": "^Disliked \u201C(.+?)\u201D$", + "emoji_reaction_ios_dislike_removed": "^Removed a dislike from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_laugh_added": "^Laughed at \u201C(.+?)\u201D$", + "emoji_reaction_ios_laugh_removed": "^Removed a laugh from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_exclamation_added": "^Emphasized \u201C(.+?)\u201D$", + "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from \u201C(.+?)\u201D$", + + "emoji_reaction_ios_question_mark_added": "^Questioned \u201C(.+?)\u201D$", + "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from \u201C(.+?)\u201D$" +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt new file mode 100644 index 00000000..0ae1b12b --- /dev/null +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt @@ -0,0 +1,31 @@ +package dev.octoshrimpy.quik.repository + +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = false) +data class EmojiPatternStrings( + @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String, + @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String, + + @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String, + @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String, + + @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String, + @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String, + + @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String, + @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String, + + @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String, + @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String, + + @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String, + @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String, + + @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String, + @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String, + + @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String, + @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String, +) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 2b077e18..0ba0737b 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -18,19 +18,98 @@ */ package dev.octoshrimpy.quik.repository +import android.content.Context +import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message -import dev.octoshrimpy.quik.repository.EmojiReactionUtils.reactionPatterns -import dev.octoshrimpy.quik.repository.EmojiReactionUtils.removalPatterns import io.realm.Realm import io.realm.Sort import timber.log.Timber import javax.inject.Inject class EmojiReactionRepositoryImpl @Inject constructor( - private val keyManager: KeyManager + private val context: Context, + private val keyManager: KeyManager, + private val moshi: Moshi, ) : EmojiReactionRepository { + + // We use an ordered map to make sure we test tapback regexes before generic ones + private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + + init { + val assetEntries = loadEmojiPatternEntriesFromAssets() + assetEntries.forEach { (localeTag, strings) -> + try { + addPatternsForLocaleStrings(localeTag, strings, reactionPatterns, removalPatterns) + } catch (e: Exception) { + Timber.w(e, "Failed to load asset patterns for locale: $localeTag") + } + } + Timber.i("Loaded emoji reaction patterns for locales: ${assetEntries.map { it.first }}") + } + + private fun addPatternsForLocaleStrings( + localeTag: String, + strings: EmojiPatternStrings, + reactionPatterns: LinkedHashMap ParsedEmojiReaction?>, + removalPatterns: LinkedHashMap ParsedEmojiReaction?> + ) { + // Google Messages + reactionPatterns[Regex(strings.googleAdded)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + removalPatterns[Regex(strings.googleRemoved)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + + // iOS tapbacks (order matters: specific before generic) + val tapbacks = listOf( + Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), + Triple("👍", strings.iosLikeAdded, strings.iosLikeRemoved), + Triple("👎", strings.iosDislikeAdded, strings.iosDislikeRemoved), + Triple("😂", strings.iosLaughAdded, strings.iosLaughRemoved), + Triple("‼️", strings.iosExclamationAdded, strings.iosExclamationRemoved), + Triple("❓", strings.iosQuestionMarkAdded, strings.iosQuestionMarkRemoved) + ) + tapbacks.forEach { (emoji, added, removed) -> + reactionPatterns[Regex(added)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } + + removalPatterns[Regex(removed)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + } + + // Generic iOS emoji patterns + reactionPatterns[Regex(strings.iosGenericAdded)] = { match -> + if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" + else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + } + removalPatterns[Regex(strings.iosGenericRemoved)] = { match -> + // TODO: sticker? + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + } + + Timber.d("Loaded emoji regex patterns for $localeTag from assets") + } + + private fun loadEmojiPatternEntriesFromAssets(): List> { + val dir = "emojis" + val files = context.assets.list(dir) ?: emptyArray() + return files.filter { it.endsWith(".json", ignoreCase = true) } + .mapNotNull { filename -> + val localeTag = filename.removeSuffix(".json") + try { + val json = context.assets.open("$dir/$filename").bufferedReader().use { it.readText() } + val data = parseEmojiPatternsJson(json) + localeTag to data + } catch (e: Exception) { + Timber.w(e, "Failed parsing emoji patterns asset: $filename") + null + } + } + } + + private fun parseEmojiPatternsJson(json: String): EmojiPatternStrings { + val adapter = moshi.adapter(EmojiPatternStrings::class.java) + return requireNotNull(adapter.fromJson(json)) { "Invalid emoji patterns JSON" } + } + override fun parseEmojiReaction(body: String): ParsedEmojiReaction? { val removal = parseRemoval(body) if (removal != null) return removal @@ -68,7 +147,11 @@ class EmojiReactionRepositoryImpl @Inject constructor( * Search for messages in the same thread with matching text content * We'll search recent messages first */ - override fun findTargetMessage(threadId: Long, originalMessageText: String, realm: Realm): Message? { + override fun findTargetMessage( + threadId: Long, + originalMessageText: String, + realm: Realm + ): Message? { val startTime = System.currentTimeMillis() val messages = realm.where(Message::class.java) .equalTo("threadId", threadId) @@ -93,7 +176,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionMessage: Message, reaction: ParsedEmojiReaction, targetMessage: Message?, - realm: Realm, ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") @@ -122,7 +204,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm: Realm, ) { if (parsedReaction.isRemoval) { - removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage) return } @@ -193,50 +275,3 @@ class EmojiReactionRepositoryImpl @Inject constructor( } } - -object EmojiReactionUtils { - private fun tapback(emoji: String, isRemoval: Boolean = false): (MatchResult) -> ParsedEmojiReaction { - return { match -> - ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval) - } - } - - val reactionPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - https://github.com/octoshrimpy/quik/issues/152#issuecomment-2330183516 - Regex("^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS - Regex("^Reacted (.+?) to \u201C(.+?)\u201D$") to { match -> - if (match.groupValues[1] == "with a sticker") - null - else - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) - }, - // iOS tapbacks - Regex("^Loved \u201C(.+?)\u201D$") to tapback("❤️"), - Regex("^Liked \u201C(.+?)\u201D$") to tapback("👍"), - Regex("^Disliked \u201C(.+?)\u201D$") to tapback("👎"), - Regex("^Laughed at \u201C(.+?)\u201D$") to tapback("😂"), - Regex("^Emphasized \u201C(.+?)\u201D$") to tapback("‼️"), - Regex("^Questioned \u201C(.+?)\u201D$") to tapback("❓"), - ) - - val removalPatterns: Map ParsedEmojiReaction?> = mapOf( - // Google Messages - Regex("^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - // iOS tapbacks - Regex("^Removed a heart from \u201C(.+?)\u201D$") to tapback("❤️", true), - Regex("^Removed a like from \u201C(.+?)\u201D$") to tapback("👍", true), - Regex("^Removed a dislike from \u201C(.+?)\u201D$") to tapback("👎", true), - Regex("^Removed a laugh from \u201C(.+?)\u201D$") to tapback("😂", true), - Regex("^Removed an exclamation from \u201C(.+?)\u201D$") to tapback("‼️", true), - Regex("^Removed a question mark from \u201C(.+?)\u201D$") to tapback("❓", true), - // iOS emoji - keep this below tapbacks as this regex would otherwise also match the patterns above - Regex("^Removed (.+?) from \u201C(.+?)\u201D$") to { match -> - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) - }, - ) -} diff --git a/presentation/build.gradle b/presentation/build.gradle index ef9cd9c0..aecce717 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -95,6 +95,13 @@ android { signingConfigs.release.keyAlias = System.getenv("key_alias") signingConfigs.release.keyPassword = System.getenv("key_password") } + + bundle { + language { + // avoid splitting out languages because we want to handle an emoji reaction in any language + enableSplit = false + } + } } androidExtensions { From 2ab9ef398132a61bda210ee37c7726c720e630d4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 00:56:57 -0400 Subject: [PATCH 80/99] Make localization easier use unicode chars, and allow partial jsons --- data/src/main/assets/emojis/en.json | 32 +++++++------- data/src/main/assets/emojis/ru.json | 4 ++ .../repository/EmojiReactionRepositoryImpl.kt | 42 ++++++++++++------- .../EmojiPatternStrings.kt | 36 ++++++++-------- 4 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 data/src/main/assets/emojis/ru.json rename data/src/main/java/com/moez/QKSMS/{repository => util}/EmojiPatternStrings.kt (70%) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 402dbdb1..4cd968b6 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,25 +1,25 @@ { - "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to \u201C\u200A(.+?)\u200A\u201D\u200A$", - "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from \u201C\u200A(.+?)\u200A\u201D\u200A$", + "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to “\u200A(.+?)\u200A”\u200A$", + "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to \u201C(.+?)\u201D$", - "emoji_reaction_ios_generic_removed": "^Removed (.+?) from \u201C(.+?)\u201D$", + "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", + "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", - "emoji_reaction_ios_heart_added": "^Loved \u201C(.+?)\u201D$", - "emoji_reaction_ios_heart_removed": "^Removed a heart from \u201C(.+?)\u201D$", + "emoji_reaction_ios_heart_added": "^Loved “(.+?)”$", + "emoji_reaction_ios_heart_removed": "^Removed a heart from “(.+?)”$", - "emoji_reaction_ios_like_added": "^Liked \u201C(.+?)\u201D$", - "emoji_reaction_ios_like_removed": "^Removed a like from \u201C(.+?)\u201D$", + "emoji_reaction_ios_like_added": "^Liked “(.+?)”$", + "emoji_reaction_ios_like_removed": "^Removed a like from “(.+?)”$", - "emoji_reaction_ios_dislike_added": "^Disliked \u201C(.+?)\u201D$", - "emoji_reaction_ios_dislike_removed": "^Removed a dislike from \u201C(.+?)\u201D$", + "emoji_reaction_ios_dislike_added": "^Disliked “(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^Removed a dislike from “(.+?)”$", - "emoji_reaction_ios_laugh_added": "^Laughed at \u201C(.+?)\u201D$", - "emoji_reaction_ios_laugh_removed": "^Removed a laugh from \u201C(.+?)\u201D$", + "emoji_reaction_ios_laugh_added": "^Laughed at “(.+?)”$", + "emoji_reaction_ios_laugh_removed": "^Removed a laugh from “(.+?)”$", - "emoji_reaction_ios_exclamation_added": "^Emphasized \u201C(.+?)\u201D$", - "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from \u201C(.+?)\u201D$", + "emoji_reaction_ios_exclamation_added": "^Emphasized “(.+?)”$", + "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from “(.+?)”$", - "emoji_reaction_ios_question_mark_added": "^Questioned \u201C(.+?)\u201D$", - "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from \u201C(.+?)\u201D$" + "emoji_reaction_ios_question_mark_added": "^Questioned “(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from “(.+?)”$" } diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json new file mode 100644 index 00000000..dcafcd58 --- /dev/null +++ b/data/src/main/assets/emojis/ru.json @@ -0,0 +1,4 @@ +{ + "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", + "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$" +} diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 0ba0737b..d072374c 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -23,6 +23,7 @@ import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message +import dev.octoshrimpy.quik.util.EmojiPatternStrings import io.realm.Realm import io.realm.Sort import timber.log.Timber @@ -57,32 +58,43 @@ class EmojiReactionRepositoryImpl @Inject constructor( removalPatterns: LinkedHashMap ParsedEmojiReaction?> ) { // Google Messages - reactionPatterns[Regex(strings.googleAdded)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } - removalPatterns[Regex(strings.googleRemoved)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + strings.googleAdded?.let { pattern -> + reactionPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + } + strings.googleRemoved?.let { pattern -> + removalPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + } - // iOS tapbacks (order matters: specific before generic) - val tapbacks = listOf( + // iOS tapbacks (important to add these before generic emoji patterns as the regexes may overlap) + listOf( Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), Triple("👍", strings.iosLikeAdded, strings.iosLikeRemoved), Triple("👎", strings.iosDislikeAdded, strings.iosDislikeRemoved), Triple("😂", strings.iosLaughAdded, strings.iosLaughRemoved), Triple("‼️", strings.iosExclamationAdded, strings.iosExclamationRemoved), Triple("❓", strings.iosQuestionMarkAdded, strings.iosQuestionMarkRemoved) - ) - tapbacks.forEach { (emoji, added, removed) -> - reactionPatterns[Regex(added)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } - - removalPatterns[Regex(removed)] = { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + ).forEach { (emoji, added, removed) -> + added?.let { + reactionPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1]) } + } + removed?.let { + removalPatterns[Regex(it)] = + { match -> ParsedEmojiReaction(emoji, match.groupValues[1], isRemoval = true) } + } } // Generic iOS emoji patterns - reactionPatterns[Regex(strings.iosGenericAdded)] = { match -> - if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" - else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + strings.iosGenericAdded?.let { pattern -> + reactionPatterns[Regex(pattern)] = { match -> + if (match.groupValues.getOrNull(1) == "with a sticker") null // TODO: localize "with a sticker" + else ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) + } } - removalPatterns[Regex(strings.iosGenericRemoved)] = { match -> - // TODO: sticker? - ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + strings.iosGenericRemoved?.let { pattern -> + removalPatterns[Regex(pattern)] = { match -> + ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) + } } Timber.d("Loaded emoji regex patterns for $localeTag from assets") diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt similarity index 70% rename from data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt rename to data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index 0ae1b12b..a5ea71d1 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -1,31 +1,31 @@ -package dev.octoshrimpy.quik.repository +package dev.octoshrimpy.quik.util import com.squareup.moshi.Json import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = false) data class EmojiPatternStrings( - @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String, - @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String, + @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String? = null, + @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String? = null, - @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String, - @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String, + @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String? = null, + @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String? = null, - @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String, - @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String, + @Json(name = "emoji_reaction_ios_heart_added") val iosHeartAdded: String? = null, + @Json(name = "emoji_reaction_ios_heart_removed") val iosHeartRemoved: String? = null, - @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String, - @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String, + @Json(name = "emoji_reaction_ios_like_added") val iosLikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_like_removed") val iosLikeRemoved: String? = null, - @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String, - @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String, + @Json(name = "emoji_reaction_ios_dislike_added") val iosDislikeAdded: String? = null, + @Json(name = "emoji_reaction_ios_dislike_removed") val iosDislikeRemoved: String? = null, - @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String, - @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String, + @Json(name = "emoji_reaction_ios_laugh_added") val iosLaughAdded: String? = null, + @Json(name = "emoji_reaction_ios_laugh_removed") val iosLaughRemoved: String? = null, - @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String, - @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String, + @Json(name = "emoji_reaction_ios_exclamation_added") val iosExclamationAdded: String? = null, + @Json(name = "emoji_reaction_ios_exclamation_removed") val iosExclamationRemoved: String? = null, - @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String, - @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String, -) + @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null, + @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null, +) \ No newline at end of file From 0e522f034655d35d89c8d67881e1a97c2f21b21e Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 01:19:26 -0400 Subject: [PATCH 81/99] add more russian regexes --- data/src/main/assets/emojis/ru.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index dcafcd58..9c0b3e13 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,4 +1,16 @@ { "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$" + "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$", + + "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", + + "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", + + "emoji_reaction_ios_dislike_added": "^Не понравилось «(.+?)»$", + + "emoji_reaction_ios_laugh_added": "^Посмеялись над «(.+?)»$", + + "emoji_reaction_ios_exclamation_added": "^Отмечено «(.+?)»$", + + "emoji_reaction_ios_question_mark_added": "^Поставлен вопрос на «(.+?)»$" } From bada73133eb14c154fc8f70354ecfdbb2f269cdf Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 02:19:02 -0400 Subject: [PATCH 82/99] Start migration to view bindings The codebase currently relies on kotlin synthetics to bind views, which is deprecated. This blocks future upgrades like moving to Kotlin 2.x https://developer.android.com/topic/libraries/view-binding/migration --- presentation/build.gradle | 1 + .../moez/QKSMS/common/widget/AvatarView.kt | 24 ++++++++++--------- .../com/moez/QKSMS/common/widget/QkDialog.kt | 6 ++--- .../QKSMS/common/widget/TextInputDialog.kt | 6 ++--- .../feature/changelog/ChangelogDialog.kt | 6 ++--- .../settings/autodelete/AutoDeleteDialog.kt | 6 ++--- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/presentation/build.gradle b/presentation/build.gradle index ef9cd9c0..b1e11f91 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -89,6 +89,7 @@ android { namespace 'dev.octoshrimpy.quik' buildFeatures { buildConfig true + viewBinding true } if (System.getenv("CI") == "true") { signingConfigs.release.storePassword = System.getenv("keystore_password") diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index 5b6238ed..245800ee 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -20,6 +20,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.FrameLayout import dev.octoshrimpy.quik.R @@ -27,10 +28,10 @@ import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint import dev.octoshrimpy.quik.common.util.extensions.setTint +import dev.octoshrimpy.quik.databinding.AvatarViewBinding import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.model.Recipient import dev.octoshrimpy.quik.util.GlideApp -import kotlinx.android.synthetic.main.avatar_view.view.* import javax.inject.Inject class AvatarView @JvmOverloads constructor( @@ -45,6 +46,7 @@ class AvatarView @JvmOverloads constructor( private var photoUri: String? = null private var lastUpdated: Long? = null private var theme: Colors.Theme + private var layout: AvatarViewBinding init { if (!isInEditMode) { @@ -53,7 +55,7 @@ class AvatarView @JvmOverloads constructor( theme = colors.theme() - View.inflate(context, R.layout.avatar_view, this) + layout = AvatarViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(R.drawable.circle) clipToOutline = true } @@ -81,8 +83,8 @@ class AvatarView @JvmOverloads constructor( private fun updateView() { // Apply theme setBackgroundTint(theme.theme) - initial.setTextColor(theme.textPrimary) - icon.setTint(theme.textPrimary) + layout.initial.setTextColor(theme.textPrimary) + layout.icon.setTint(theme.textPrimary) val initials = fullName ?.substringBefore(',') @@ -93,18 +95,18 @@ class AvatarView @JvmOverloads constructor( .map { initial -> initial.toString() } if (initials.isNotEmpty()) { - initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first() - icon.visibility = GONE + layout.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first() + layout.icon.visibility = GONE } else { - initial.text = null - icon.visibility = VISIBLE + layout.initial.text = null + layout.icon.visibility = VISIBLE } - photo.setImageDrawable(null) + layout.photo.setImageDrawable(null) photoUri?.let { photoUri -> - GlideApp.with(photo) + GlideApp.with(layout.photo) .load(photoUri) - .into(photo) + .into(layout.photo) } } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt index 6d134cd3..5fd29db0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt @@ -25,11 +25,11 @@ import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import kotlinx.android.synthetic.main.qk_dialog.view.* +import dev.octoshrimpy.quik.databinding.QkDialogBinding class QkDialog(private val context: Activity) : AlertDialog(context) { - private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null) + private val view = QkDialogBinding.inflate(LayoutInflater.from(context)) @StringRes var titleRes: Int? = null @@ -99,7 +99,7 @@ class QkDialog(private val context: Activity) : AlertDialog(context) { } init { - setView(view) + setView(view.root) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt index f27808a1..39b59957 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt @@ -23,16 +23,16 @@ import android.content.DialogInterface import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R -import kotlinx.android.synthetic.main.text_input_dialog.view.* +import dev.octoshrimpy.quik.databinding.TextInputDialogBinding class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) { - private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null) + private val layout = TextInputDialogBinding.inflate(LayoutInflater.from(context)) init { layout.field.hint = hint - setView(layout) + setView(layout.root) setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> } setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") } setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ -> diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt index 94a7e774..01f775ba 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogDialog.kt @@ -22,11 +22,11 @@ import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.BuildConfig import dev.octoshrimpy.quik.R +import dev.octoshrimpy.quik.databinding.ChangelogDialogBinding import dev.octoshrimpy.quik.feature.main.MainActivity import dev.octoshrimpy.quik.manager.ChangelogManager import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.changelog_dialog.view.* class ChangelogDialog(activity: MainActivity) { @@ -36,11 +36,11 @@ class ChangelogDialog(activity: MainActivity) { private val adapter = ChangelogAdapter(activity) init { - val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null) + val layout = ChangelogDialogBinding.inflate(LayoutInflater.from(activity)) dialog = AlertDialog.Builder(activity) .setCancelable(true) - .setView(layout) + .setView(layout.root) .create() layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt index cab56d77..e2377577 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/autodelete/AutoDeleteDialog.kt @@ -23,14 +23,14 @@ import android.content.DialogInterface import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog import dev.octoshrimpy.quik.R -import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.* +import dev.octoshrimpy.quik.databinding.SettingsAutoDeleteDialogBinding class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) { - private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null) + private val layout = SettingsAutoDeleteDialogBinding.inflate(LayoutInflater.from(context)) init { - setView(layout) + setView(layout.root) setTitle(R.string.settings_auto_delete) setMessage(context.getString(R.string.settings_auto_delete_dialog_message)) setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> } From 64f870661c6d6b6078edd15e517b6312d2062804 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 02:29:30 -0400 Subject: [PATCH 83/99] migrate some more widgets --- .../QKSMS/common/widget/PagerTitleView.kt | 8 +++---- .../QKSMS/common/widget/PreferenceView.kt | 21 +++++++++++-------- .../common/widget/RadioPreferenceView.kt | 18 +++++++++------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index 3b8a3031..7022447f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -31,12 +31,12 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.forEach import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor +import dev.octoshrimpy.quik.databinding.TabViewBinding import dev.octoshrimpy.quik.extensions.Optional import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.ConversationRepository import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.tab_view.view.* import javax.inject.Inject class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { @@ -66,11 +66,11 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut removeAllViews() pager?.adapter?.count?.forEach { position -> - val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false) + val view = TabViewBinding.inflate(LayoutInflater.from(context), this, false) view.label.text = pager?.adapter?.getPageTitle(position) - view.setOnClickListener { pager?.currentItem = position } + view.root.setOnClickListener { pager?.currentItem = position } - addView(view) + addView(view.root) } childCount.forEach { index -> diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index f68de924..11293d72 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet import android.view.Gravity +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.appcompat.widget.LinearLayoutCompat @@ -28,13 +29,15 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColorStateList import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.PreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.preference_view.view.* class PreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : LinearLayoutCompat(context, attrs) { + private lateinit var layout: PreferenceViewBinding + var title: String? = null set(value) { field = value @@ -42,7 +45,7 @@ class PreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -57,8 +60,8 @@ class PreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -67,12 +70,12 @@ class PreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.preference_view, this) + layout = PreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL - icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) + layout.icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run { title = getString(R.styleable.PreferenceView_title) @@ -80,13 +83,13 @@ class PreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } // If an icon is being used, set up the icon view getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id -> - icon.setVisible(true) - icon.setImageResource(id) + layout.icon.setVisible(true) + layout.icon.setImageResource(id) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt index 9a2c4e70..d40018de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout @@ -30,8 +31,8 @@ import dev.octoshrimpy.quik.common.util.extensions.forwardTouches import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.RadioPreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.radio_preference_view.view.* import javax.inject.Inject class RadioPreferenceView @JvmOverloads constructor( @@ -39,6 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor( ) : ConstraintLayout(context, attrs) { @Inject lateinit var colors: Colors + private lateinit var layout: RadioPreferenceViewBinding var title: String? = null set(value) { @@ -47,7 +49,7 @@ class RadioPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -62,8 +64,8 @@ class RadioPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -72,7 +74,7 @@ class RadioPreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.radio_preference_view, this) + layout = RadioPreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) val states = arrayOf( @@ -84,8 +86,8 @@ class RadioPreferenceView @JvmOverloads constructor( false -> colors.theme().theme } val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary) - radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) - radioButton.forwardTouches(this) + layout.radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) + layout.radioButton.forwardTouches(this) context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run { title = getString(R.styleable.RadioPreferenceView_title) @@ -93,7 +95,7 @@ class RadioPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } recycle() From bb6379446a99265795f9df788d33ef45281fcf09 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Thu, 4 Sep 2025 14:40:28 -0400 Subject: [PATCH 84/99] use generic google messages regex --- data/src/main/assets/emojis/en.json | 3 --- data/src/main/assets/emojis/ru.json | 3 --- .../repository/EmojiReactionRepositoryImpl.kt | 23 +++++++++---------- .../moez/QKSMS/util/EmojiPatternStrings.kt | 3 --- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 4cd968b6..513b7e47 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,7 +1,4 @@ { - "emoji_reaction_google_messages_added": "^\u200A\u200B(.+?)\u200B to “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_google_messages_removed": "^\u200ARemoved \u200C(.+?)\u200C from “\u200A(.+?)\u200A”\u200A$", - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index 9c0b3e13..c6416422 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,7 +1,4 @@ { - "emoji_reaction_google_messages_added": "^\u200AРеакция \u200B(.+?)\u200B на \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_google_messages_removed": "^\u200AРеакция \u200C(.+?)\u200C удалена из \"\u200A(.+?)\u200A\"\u200A$", - "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index d072374c..5aa6607e 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -34,10 +34,17 @@ class EmojiReactionRepositoryImpl @Inject constructor( private val keyManager: KeyManager, private val moshi: Moshi, ) : EmojiReactionRepository { - - // We use an ordered map to make sure we test tapback regexes before generic ones - private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() - private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf() + // We use an ordered map to make sure we can test tapback regexes before generic ones + private val reactionPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200b\u200a]*\u200b([^\u200b]*)\u200b[^\u200b\u200a]*\u200a(.*)\u200a[^\u200b\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } + ) + private val removalPatterns: LinkedHashMap ParsedEmojiReaction?> = linkedMapOf( + Regex( // Google Messages + "(?s)^\u200a[^\u200c\u200a]*\u200c([^\u200c]*)\u200c[^\u200c\u200a]*\u200a(.*)\u200a[^\u200c\u200a]*\u200a\\Z" + ) to { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } + ) init { val assetEntries = loadEmojiPatternEntriesFromAssets() @@ -57,14 +64,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionPatterns: LinkedHashMap ParsedEmojiReaction?>, removalPatterns: LinkedHashMap ParsedEmojiReaction?> ) { - // Google Messages - strings.googleAdded?.let { pattern -> - reactionPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2]) } - } - strings.googleRemoved?.let { pattern -> - removalPatterns[Regex(pattern)] = { match -> ParsedEmojiReaction(match.groupValues[1], match.groupValues[2], isRemoval = true) } - } - // iOS tapbacks (important to add these before generic emoji patterns as the regexes may overlap) listOf( Triple("❤️", strings.iosHeartAdded, strings.iosHeartRemoved), diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index a5ea71d1..1b04e13c 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -5,9 +5,6 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = false) data class EmojiPatternStrings( - @Json(name = "emoji_reaction_google_messages_added") val googleAdded: String? = null, - @Json(name = "emoji_reaction_google_messages_removed") val googleRemoved: String? = null, - @Json(name = "emoji_reaction_ios_generic_added") val iosGenericAdded: String? = null, @Json(name = "emoji_reaction_ios_generic_removed") val iosGenericRemoved: String? = null, From e76fbbdca1a2ad9d9192046d819818cf38cf7a5e Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Fri, 5 Sep 2025 00:46:14 -0400 Subject: [PATCH 85/99] migrate more --- .../com/moez/QKSMS/common/MenuItemAdapter.kt | 27 +++++++++---------- .../moez/QKSMS/common/base/QkViewHolder.kt | 3 +++ .../moez/QKSMS/common/widget/AvatarView.kt | 1 - .../QKSMS/common/widget/GroupAvatarView.kt | 22 +++++++-------- .../QKSMS/common/widget/PagerTitleView.kt | 1 - .../QKSMS/common/widget/PreferenceView.kt | 2 +- .../com/moez/QKSMS/common/widget/QkDialog.kt | 1 - .../common/widget/RadioPreferenceView.kt | 2 +- .../feature/changelog/ChangelogAdapter.kt | 19 +++++++------ 9 files changed, 36 insertions(+), 42 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt index 52469313..b9f4bcc0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/MenuItemAdapter.kt @@ -24,22 +24,20 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.annotation.ArrayRes import androidx.recyclerview.widget.RecyclerView -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.MenuListItemBinding import io.reactivex.disposables.CompositeDisposable import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.menu_list_item.* -import kotlinx.android.synthetic.main.menu_list_item.view.* import javax.inject.Inject data class MenuItem(val title: String, val actionId: Int) -class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter() { +class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter>() { val menuItemClicks: Subject = PublishSubject.create() @@ -63,31 +61,30 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private .mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) } } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = MenuListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) val states = arrayOf( intArrayOf(android.R.attr.state_activated), intArrayOf(-android.R.attr.state_activated)) val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary) - view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) + binding.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text)) - return QkViewHolder(view).apply { - view.setOnClickListener { + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val menuItem = getItem(adapterPosition) menuItemClicks.onNext(menuItem.actionId) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val menuItem = getItem(position) - holder.title.text = menuItem.title - holder.check.isActivated = (menuItem.actionId == selectedItem) - holder.check.setVisible(selectedItem != null) + holder.binding.title.text = menuItem.title + holder.binding.check.isActivated = (menuItem.actionId == selectedItem) + holder.binding.check.setVisible(selectedItem != null) } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt index 4bf15117..889fdd36 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkViewHolder.kt @@ -20,8 +20,11 @@ package dev.octoshrimpy.quik.common.base import android.view.View import androidx.recyclerview.widget.RecyclerView +import androidx.viewbinding.ViewBinding import kotlinx.android.extensions.LayoutContainer open class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer { override val containerView: View = view } + +open class QkBindingViewHolder(val binding: T) : QkViewHolder(binding.root) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt index 245800ee..b1fc5eb7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt @@ -21,7 +21,6 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.view.View import android.widget.FrameLayout import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt index 26e95e94..641261a7 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/GroupAvatarView.kt @@ -20,31 +20,29 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet -import android.view.View +import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.getColorCompat import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint +import dev.octoshrimpy.quik.databinding.GroupAvatarViewBinding import dev.octoshrimpy.quik.model.Recipient -import kotlinx.android.synthetic.main.group_avatar_view.view.* class GroupAvatarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : ConstraintLayout(context, attrs) { + private var layout: GroupAvatarViewBinding = + GroupAvatarViewBinding.inflate(LayoutInflater.from(context), this) + var recipients: List = ArrayList() set(value) { field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey }) updateView() } - init { - View.inflate(context, R.layout.group_avatar_view, this) - } - override fun onFinishInflate() { super.onFinishInflate() @@ -54,18 +52,18 @@ class GroupAvatarView @JvmOverloads constructor( } private fun updateView() { - avatar1Frame.setBackgroundTint(when (recipients.size > 1) { + layout.avatar1Frame.setBackgroundTint(when (recipients.size > 1) { true -> context.resolveThemeColor(android.R.attr.windowBackground) false -> context.getColorCompat(android.R.color.transparent) }) - avatar1Frame.updateLayoutParams { + layout.avatar1Frame.updateLayoutParams { matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f } - avatar2.isVisible = recipients.size > 1 + layout.avatar2.isVisible = recipients.size > 1 - recipients.getOrNull(0).run(avatar1::setRecipient) - recipients.getOrNull(1).run(avatar2::setRecipient) + recipients.getOrNull(0).run(layout.avatar1::setRecipient) + recipients.getOrNull(1).run(layout.avatar2::setRecipient) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index 7022447f..eb90b584 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -27,7 +27,6 @@ import android.widget.TextView import androidx.viewpager.widget.ViewPager import com.uber.autodispose.android.ViewScopeProvider import com.uber.autodispose.autoDisposable -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.forEach import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index 11293d72..b1400f39 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -36,7 +36,7 @@ class PreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : LinearLayoutCompat(context, attrs) { - private lateinit var layout: PreferenceViewBinding + private var layout: PreferenceViewBinding var title: String? = null set(value) { diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt index 5fd29db0..f5b74229 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/QkDialog.kt @@ -23,7 +23,6 @@ import android.view.LayoutInflater import androidx.annotation.StringRes import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter import dev.octoshrimpy.quik.databinding.QkDialogBinding diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt index d40018de..161af9e1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt @@ -40,7 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor( ) : ConstraintLayout(context, attrs) { @Inject lateinit var colors: Colors - private lateinit var layout: RadioPreferenceViewBinding + private var layout: RadioPreferenceViewBinding var title: String? = null set(value) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt index 441ba84b..463e2701 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/changelog/ChangelogAdapter.kt @@ -24,11 +24,11 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ChangelogListItemBinding import dev.octoshrimpy.quik.manager.ChangelogManager -import kotlinx.android.synthetic.main.changelog_list_item.* -class ChangelogAdapter(private val context: Context) : QkAdapter() { +class ChangelogAdapter(private val context: Context) : QkAdapter>() { data class ChangelogItem(val type: Int, val label: String) @@ -57,19 +57,18 @@ class ChangelogAdapter(private val context: Context) : QkAdapter { + val binding = ChangelogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { if (viewType == 0) { - changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD) + binding.changelogItem.setTypeface(binding.changelogItem.typeface, Typeface.BOLD) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position) - - holder.changelogItem.text = item.label + holder.binding.changelogItem.text = item.label } override fun getItemViewType(position: Int): Int { From 90723d80a7fea47cd241ded4817a9401592fc726 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Fri, 5 Sep 2025 00:56:29 -0400 Subject: [PATCH 86/99] QkRealmAdapter binding support --- .../moez/QKSMS/common/base/QkRealmAdapter.kt | 2 +- .../filters/MessageContentFiltersAdapter.kt | 2 +- .../messages/BlockedMessagesAdapter.kt | 2 +- .../blocking/numbers/BlockedNumbersAdapter.kt | 2 +- .../QKSMS/feature/compose/MessagesAdapter.kt | 2 +- .../feature/compose/editing/ChipsAdapter.kt | 24 +++++----- .../compose/editing/PhoneNumberAdapter.kt | 19 ++++---- .../conversations/ConversationsAdapter.kt | 2 +- .../feature/gallery/GalleryPagerAdapter.kt | 2 +- .../scheduled/ScheduledMessageAdapter.kt | 44 +++++++++---------- 10 files changed, 49 insertions(+), 52 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt index c4e016a8..e6da54e2 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkRealmAdapter.kt @@ -30,7 +30,7 @@ import io.realm.RealmRecyclerViewAdapter import io.realm.RealmResults import timber.log.Timber -abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { +abstract class QkRealmAdapter : RealmRecyclerViewAdapter(null, true) { /** * This view can be set, and the adapter will automatically control the visibility of this view diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt index f6b6818d..894e8c66 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -30,7 +30,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.message_content_filter_list_item.* import kotlinx.android.synthetic.main.message_content_filter_list_item.view.* -class MessageContentFiltersAdapter : QkRealmAdapter() { +class MessageContentFiltersAdapter : QkRealmAdapter() { val removeMessageContentFilter: Subject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt index b264fe44..5a2a88de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/messages/BlockedMessagesAdapter.kt @@ -38,7 +38,7 @@ import javax.inject.Inject class BlockedMessagesAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter -) : QkRealmAdapter() { +) : QkRealmAdapter() { val clicks: PublishSubject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt index 3ef278e9..c18bdb63 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt @@ -29,7 +29,7 @@ import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.blocked_number_list_item.* import kotlinx.android.synthetic.main.blocked_number_list_item.view.* -class BlockedNumbersAdapter : QkRealmAdapter() { +class BlockedNumbersAdapter : QkRealmAdapter() { val unblockAddress: Subject = PublishSubject.create() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 7aa6ea93..9eef4813 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -97,7 +97,7 @@ class MessagesAdapter @Inject constructor( private val prefs: Preferences, private val textViewStyler: TextViewStyler, private val navigator: Navigator, -) : QkRealmAdapter() { +) : QkRealmAdapter() { class AudioState( var partId: Long = -1, var state: QkMediaPlayer.PlayingState = QkMediaPlayer.PlayingState.Stopped, diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 67489994..6a3185d9 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -23,36 +23,34 @@ import android.view.LayoutInflater import android.view.ViewGroup import android.widget.RelativeLayout import androidx.recyclerview.widget.RecyclerView -import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.extensions.dpToPx +import dev.octoshrimpy.quik.databinding.ContactChipBinding import dev.octoshrimpy.quik.model.Recipient import io.reactivex.subjects.PublishSubject -import kotlinx.android.synthetic.main.contact_chip.* import javax.inject.Inject -class ChipsAdapter @Inject constructor() : QkAdapter() { +class ChipsAdapter @Inject constructor() : QkAdapter>() { var view: RecyclerView? = null val chipDeleted: PublishSubject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_chip, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactChipBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val chip = getItem(adapterPosition) - showDetailedChip(view.context, chip) + showDetailedChip(binding.root.context, chip) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val recipient = getItem(position) - holder.avatar.setRecipient(recipient) - holder.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address + holder.binding.avatar.setRecipient(recipient) + holder.binding.name.text = recipient.contact?.name?.takeIf { it.isNotBlank() } ?: recipient.address } /** diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt index 5d2658aa..7260bc84 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/PhoneNumberAdapter.kt @@ -22,23 +22,22 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ContactNumberListItemBinding import dev.octoshrimpy.quik.model.PhoneNumber -import kotlinx.android.synthetic.main.contact_number_list_item.* -class PhoneNumberAdapter : QkAdapter() { +class PhoneNumberAdapter : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val inflater = LayoutInflater.from(parent.context) - val view = inflater.inflate(R.layout.contact_number_list_item, parent, false) - return QkViewHolder(view) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ContactNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding) } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val number = getItem(position) - holder.address.text = number.address - holder.type.text = number.type + holder.binding.address.text = number.address + holder.binding.type.text = number.type } override fun areItemsTheSame(old: PhoneNumber, new: PhoneNumber): Boolean { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt index fae962d1..ffad063a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt @@ -48,7 +48,7 @@ class ConversationsAdapter @Inject constructor( private val scheduledMessageRepo: ScheduledMessageRepository, private val navigator: Navigator, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter() { private val disposables = CompositeDisposable() init { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt index c6497932..65882e5b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/gallery/GalleryPagerAdapter.kt @@ -45,7 +45,7 @@ import kotlinx.android.synthetic.main.gallery_video_page.* import java.util.* import javax.inject.Inject -class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { +class GalleryPagerAdapter @Inject constructor(private val context: Context) : QkRealmAdapter() { companion object { private const val VIEW_TYPE_INVALID = 0 diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt index eb522a95..991c1ab0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAdapter.kt @@ -26,7 +26,8 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder +import dev.octoshrimpy.quik.databinding.ScheduledMessageListItemBinding import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.model.Contact import dev.octoshrimpy.quik.model.Recipient @@ -35,8 +36,6 @@ import dev.octoshrimpy.quik.repository.ContactRepository import dev.octoshrimpy.quik.util.PhoneNumberUtils import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.scheduled_message_list_item.* -import kotlinx.android.synthetic.main.scheduled_message_list_item.view.* import javax.inject.Inject class ScheduledMessageAdapter @Inject constructor( @@ -44,7 +43,7 @@ class ScheduledMessageAdapter @Inject constructor( private val contactRepo: ContactRepository, private val dateFormatter: DateFormatter, private val phoneNumberUtils: PhoneNumberUtils -) : QkRealmAdapter() { +) : QkRealmAdapter>() { private val contacts by lazy { contactRepo.getContacts() } private val contactCache = ContactCache() @@ -52,47 +51,48 @@ class ScheduledMessageAdapter @Inject constructor( val clicks: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context) - .inflate(R.layout.scheduled_message_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = ScheduledMessageListItemBinding.inflate( + LayoutInflater.from(parent.context), parent, false + ) - view.attachments.adapter = ScheduledMessageAttachmentAdapter(context) - view.attachments.setRecycledViewPool(imagesViewPool) + binding.attachments.adapter = ScheduledMessageAttachmentAdapter(context) + binding.attachments.setRecycledViewPool(imagesViewPool) - return QkViewHolder(view).apply { - view.setOnClickListener { + return QkBindingViewHolder(binding).apply { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener if (toggleSelection(message.id, false)) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } - view.setOnClickListener { + binding.root.setOnClickListener { val message = getItem(adapterPosition) ?: return@setOnClickListener toggleSelection(message.id) - view.isActivated = isSelected(message.id) + binding.root.isActivated = isSelected(message.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val message = getItem(position) ?: return // GroupAvatarView only accepts recipients, so map the phone numbers to recipients - holder.avatars.recipients = + holder.binding.avatars.recipients = message.recipients.map { address -> Recipient(address = address) } - holder.recipients.text = message.recipients.joinToString(",") { address -> + holder.binding.recipients.text = message.recipients.joinToString(",") { address -> contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address } - holder.date.text = dateFormatter.getScheduledTimestamp(message.date) - holder.body.text = message.body + holder.binding.date.text = dateFormatter.getScheduledTimestamp(message.date) + holder.binding.body.text = message.body // update the selected/highlighted state - holder.containerView.isActivated = isSelected(message.id) || highlight == message.id + holder.binding.root.isActivated = isSelected(message.id) || highlight == message.id - val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter + val adapter = holder.binding.attachments.adapter as ScheduledMessageAttachmentAdapter adapter.data = message.attachments.map(Uri::parse) - holder.attachments.isVisible = message.attachments.isNotEmpty() + holder.binding.attachments.isVisible = message.attachments.isNotEmpty() } override fun getItemId(position: Int): Long { From 3cdaf26317e6ce3fb781f35eedb839be084d59af Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Fri, 5 Sep 2025 01:44:06 -0400 Subject: [PATCH 87/99] more migrations --- .../com/moez/QKSMS/common/base/QkActivity.kt | 7 ++ .../QKSMS/common/widget/PreferenceView.kt | 4 +- .../QKSMS/feature/backup/BackupActivity.kt | 10 +-- .../feature/blocking/BlockingActivity.kt | 10 +-- .../filters/MessageContentFiltersAdapter.kt | 25 ++++--- .../manager/BlockingManagerPreferenceView.kt | 17 +++-- .../blocking/numbers/BlockedNumbersAdapter.kt | 19 +++-- .../moez/QKSMS/feature/main/SearchAdapter.kt | 36 +++++----- .../moez/QKSMS/feature/plus/PlusActivity.kt | 72 +++++++++---------- .../ScheduledMessageAttachmentAdapter.kt | 30 ++++---- .../main/res/layout/qksms_plus_activity.xml | 6 +- 11 files changed, 123 insertions(+), 113 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt index 89a583fe..3a49726b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem +import android.view.View import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import dev.octoshrimpy.quik.util.Preferences @@ -63,6 +64,12 @@ abstract class QkActivity : AppCompatActivity() { title = title // The title may have been set before layout inflation } + override fun setContentView(view: View?) { + super.setContentView(view) + setSupportActionBar(toolbar) + title = title // The title may have been set before layout inflation + } + override fun setTitle(titleId: Int) { title = getString(titleId) } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index b1400f39..8486e510 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -38,6 +38,8 @@ class PreferenceView @JvmOverloads constructor( private var layout: PreferenceViewBinding + val titleTextView: TextView get() = layout.titleView + var title: String? = null set(value) { field = value @@ -96,4 +98,4 @@ class PreferenceView @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index 8c7e7ba5..fdf7b8ac 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt @@ -25,19 +25,21 @@ import com.bluelinelabs.conductor.RouterTransaction import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BackupActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BackupController())) } @@ -49,4 +51,4 @@ class BackupActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt index a30f4863..8afc1554 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt @@ -25,18 +25,20 @@ import com.bluelinelabs.conductor.RouterTransaction import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BlockingActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BlockingController())) } @@ -48,4 +50,4 @@ class BlockingActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt index 894e8c66..afd7df03 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -23,33 +23,32 @@ import android.view.View import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.model.MessageContentFilter import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.message_content_filter_list_item.* -import kotlinx.android.synthetic.main.message_content_filter_list_item.view.* +import dev.octoshrimpy.quik.databinding.MessageContentFilterListItemBinding -class MessageContentFiltersAdapter : QkRealmAdapter() { +class MessageContentFiltersAdapter : QkRealmAdapter>() { val removeMessageContentFilter: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.message_content_filter_list_item, parent, false) - return QkViewHolder(view).apply { - containerView.removeFilter.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = MessageContentFilterListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.removeFilter.setOnClickListener { val filter = getItem(adapterPosition) ?: return@setOnClickListener removeMessageContentFilter.onNext(filter.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position)!! - holder.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE - holder.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE - holder.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE - holder.filter.text = item.value + holder.binding.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE + holder.binding.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE + holder.binding.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE + holder.binding.filter.text = item.value } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt index c1576ec7..a668d4bf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt @@ -22,6 +22,7 @@ package dev.octoshrimpy.quik.feature.blocking.manager import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.ImageView import android.widget.TextView @@ -29,12 +30,15 @@ import androidx.constraintlayout.widget.ConstraintLayout import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.setVisible -import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.* +import dev.octoshrimpy.quik.databinding.BlockingManagerPreferenceViewBinding class BlockingManagerPreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : ConstraintLayout(context, attrs) { + private val binding: BlockingManagerPreferenceViewBinding = + BlockingManagerPreferenceViewBinding.inflate(LayoutInflater.from(context), this) + var icon: Drawable? = null set(value) { field = value @@ -42,7 +46,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.iconView).setImageDrawable(value) } else { - iconView.setImageDrawable(value) + binding.iconView.setImageDrawable(value) } } @@ -53,7 +57,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + binding.titleView.text = value } } @@ -67,13 +71,12 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + binding.summaryView.text = value + binding.summaryView.setVisible(value?.isNotEmpty() == true) } } init { - View.inflate(context, R.layout.blocking_manager_preference_view, this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) context.obtainStyledAttributes(attrs, R.styleable.BlockingManagerPreferenceView).run { @@ -83,7 +86,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.BlockingManagerPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, binding.widgetFrame) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt index c18bdb63..e08bd9bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt @@ -22,31 +22,30 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.model.BlockedNumber import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.blocked_number_list_item.* -import kotlinx.android.synthetic.main.blocked_number_list_item.view.* +import dev.octoshrimpy.quik.databinding.BlockedNumberListItemBinding -class BlockedNumbersAdapter : QkRealmAdapter() { +class BlockedNumbersAdapter : QkRealmAdapter>() { val unblockAddress: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false) - return QkViewHolder(view).apply { - containerView.unblock.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = BlockedNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.unblock.setOnClickListener { val number = getItem(adapterPosition) ?: return@setOnClickListener unblockAddress.onNext(number.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position)!! - holder.number.text = item.address + holder.binding.number.text = item.address } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt index 61200d67..437bcbf6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt @@ -27,14 +27,13 @@ import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.extensions.removeAccents import dev.octoshrimpy.quik.model.SearchResult -import kotlinx.android.synthetic.main.search_list_item.* -import kotlinx.android.synthetic.main.search_list_item.view.* +import dev.octoshrimpy.quik.databinding.SearchListItemBinding import javax.inject.Inject class SearchAdapter @Inject constructor( @@ -42,26 +41,25 @@ class SearchAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator -) : QkAdapter() { +) : QkAdapter>() { private val highlightColor: Int by lazy { colors.theme().highlight } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.search_list_item, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = SearchListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + itemView.setOnClickListener { val result = getItem(adapterPosition) navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 }) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val previous = data.getOrNull(position - 1) val result = getItem(position) - holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) + holder.binding.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) val query = result.query val title = SpannableString(result.conversation.getTitle()) @@ -71,23 +69,23 @@ class SearchAdapter @Inject constructor( title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) index = title.indexOf(query, index + query.length, true) } - holder.title.text = title + holder.binding.title.text = title - holder.avatars.recipients = result.conversation.recipients + holder.binding.avatars.recipients = result.conversation.recipients when (result.messages == 0) { true -> { - holder.date.setVisible(true) - holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) - holder.snippet.text = when (result.conversation.me) { + holder.binding.date.setVisible(true) + holder.binding.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) + holder.binding.snippet.text = when (result.conversation.me) { true -> context.getString(R.string.main_sender_you, result.conversation.snippet) false -> result.conversation.snippet } } false -> { - holder.date.setVisible(false) - holder.snippet.text = context.getString(R.string.main_message_results, result.messages) + holder.binding.date.setVisible(false) + holder.binding.snippet.text = context.getString(R.string.main_message_results, result.messages) } } } @@ -101,4 +99,4 @@ class SearchAdapter @Inject constructor( old.conversation.id == new.conversation.id // Conversation id is the same && old.messages == new.messages // Result count is the same } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 222f1b3d..0a606f49 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -36,9 +36,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment import dev.octoshrimpy.quik.manager.BillingManager -import kotlinx.android.synthetic.main.collapsing_toolbar.* -import kotlinx.android.synthetic.main.preference_view.view.* -import kotlinx.android.synthetic.main.qksms_plus_activity.* +import dev.octoshrimpy.quik.databinding.QksmsPlusActivityBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -52,66 +50,68 @@ class PlusActivity : QkThemedActivity(), PlusView { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] } + private lateinit var binding: QksmsPlusActivityBinding - override val upgradeIntent by lazy { upgrade.clicks() } - override val upgradeDonateIntent by lazy { upgradeDonate.clicks() } - override val donateIntent by lazy { donate.clicks() } - override val themeClicks by lazy { themes.clicks() } - override val scheduleClicks by lazy { schedule.clicks() } - override val backupClicks by lazy { backup.clicks() } - override val delayedClicks by lazy { delayed.clicks() } - override val nightClicks by lazy { night.clicks() } + override val upgradeIntent get() = binding.upgrade.clicks() + override val upgradeDonateIntent get() = binding.upgradeDonate.clicks() + override val donateIntent get() = binding.donate.clicks() + override val themeClicks get() = binding.themes.clicks() + override val scheduleClicks get() = binding.schedule.clicks() + override val backupClicks get() = binding.backup.clicks() + override val delayedClicks get() = binding.delayed.clicks() + override val nightClicks get() = binding.night.clicks() override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.qksms_plus_activity) + binding = QksmsPlusActivityBinding.inflate(layoutInflater) + setContentView(binding.root) setTitle(R.string.title_qksms_plus) showBackButton(true) viewModel.bindView(this) - free.setVisible(false) + binding.free.setVisible(false) if (!prefs.systemFont.get()) { fontProvider.getLato { lato -> val typeface = Typeface.create(lato, Typeface.BOLD) - collapsingToolbar.setCollapsedTitleTypeface(typeface) - collapsingToolbar.setExpandedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface) } } // Make the list titles bold - linearLayout.children - .mapNotNull { it as? PreferenceView } - .map { it.titleView } - .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } + binding.linearLayout.children + .mapNotNull { it as? PreferenceView } + .map { it.titleTextView } + .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary) - collapsingToolbar.setCollapsedTitleTextColor(textPrimary) - collapsingToolbar.setExpandedTitleColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary) val theme = colors.theme().theme - donate.setBackgroundTint(theme) - upgrade.setBackgroundTint(theme) - thanksIcon.setTint(theme) + binding.donate.setBackgroundTint(theme) + binding.upgrade.setBackgroundTint(theme) + binding.thanksIcon.setTint(theme) } override fun render(state: PlusState) { - description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) - upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) - upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) + binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) + binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) + binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) val fdroid = true - free.setVisible(fdroid) - toUpgrade.setVisible(!fdroid && !state.upgraded) - upgraded.setVisible(!fdroid && state.upgraded) + binding.free.setVisible(fdroid) + binding.toUpgrade.setVisible(!fdroid && !state.upgraded) + binding.upgraded.setVisible(!fdroid && state.upgraded) - themes.isEnabled = state.upgraded - schedule.isEnabled = state.upgraded - backup.isEnabled = state.upgraded - delayed.isEnabled = state.upgraded - night.isEnabled = state.upgraded + binding.themes.isEnabled = state.upgraded + binding.schedule.isEnabled = state.upgraded + binding.backup.isEnabled = state.upgraded + binding.delayed.isEnabled = state.upgraded + binding.night.isEnabled = state.upgraded } override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) { @@ -125,4 +125,4 @@ class PlusActivity : QkThemedActivity(), PlusView { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt index 147cd7e4..ae01c494 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt @@ -25,44 +25,40 @@ import android.view.View import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.extensions.getName import dev.octoshrimpy.quik.feature.extensions.LoadBestIconIntoImageView import dev.octoshrimpy.quik.feature.extensions.loadBestIconIntoImageView -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail +import dev.octoshrimpy.quik.databinding.ScheduledMessageImageListItemBinding import javax.inject.Inject class ScheduledMessageAttachmentAdapter @Inject constructor( private val context: Context -) : QkAdapter() { +) : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder( - LayoutInflater - .from(parent.context) - .inflate(R.layout.scheduled_message_image_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder = + QkBindingViewHolder( + ScheduledMessageImageListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) ) - } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val uri = getItem(position) // set best image and text to use for icon - when (getItem(position).loadBestIconIntoImageView(context, holder.thumbnail)) { + when (getItem(position).loadBestIconIntoImageView(context, holder.binding.thumbnail)) { LoadBestIconIntoImageView.Missing -> { - holder.fileName.text = context.getString(R.string.attachment_missing) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = context.getString(R.string.attachment_missing) + holder.binding.fileName.visibility = View.VISIBLE } LoadBestIconIntoImageView.ActivityIcon, LoadBestIconIntoImageView.DefaultAudioIcon, LoadBestIconIntoImageView.GenericIcon -> { // generic style icon used, also show name - holder.fileName.text = uri.getName(context) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = uri.getName(context) + holder.binding.fileName.visibility = View.VISIBLE } - else -> holder.fileName.visibility = View.GONE + else -> holder.binding.fileName.visibility = View.GONE } } } diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 5ffa1f48..05e885b2 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -23,7 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - \ No newline at end of file + From 01a52f51a7f51b3727d705de1ac8894e6a720331 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sun, 7 Sep 2025 01:27:56 -0400 Subject: [PATCH 88/99] cleanup --- .../main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt | 2 +- .../src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt | 2 +- domain/src/main/java/com/moez/QKSMS/model/Message.kt | 2 -- .../com/moez/QKSMS/repository/EmojiReactionRepository.kt | 2 +- presentation/build.gradle | 7 ------- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt index 1b04e13c..d2509232 100644 --- a/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt +++ b/data/src/main/java/com/moez/QKSMS/util/EmojiPatternStrings.kt @@ -25,4 +25,4 @@ data class EmojiPatternStrings( @Json(name = "emoji_reaction_ios_question_mark_added") val iosQuestionMarkAdded: String? = null, @Json(name = "emoji_reaction_ios_question_mark_removed") val iosQuestionMarkRemoved: String? = null, -) \ No newline at end of file +) diff --git a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt index cb9013f6..1801df38 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/EmojiSyncNeeded.kt @@ -22,4 +22,4 @@ import io.realm.RealmObject open class EmojiSyncNeeded : RealmObject() { var createdAt: Long = System.currentTimeMillis() -} \ No newline at end of file +} diff --git a/domain/src/main/java/com/moez/QKSMS/model/Message.kt b/domain/src/main/java/com/moez/QKSMS/model/Message.kt index 5f516eeb..51029f15 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/Message.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/Message.kt @@ -74,9 +74,7 @@ open class Message : RealmObject() { var subject: String = "" var textContentType: String = "" var parts: RealmList = RealmList() - /** is this message a reaction to another message? */ var isEmojiReaction: Boolean = false - /** emoji reactions to this message */ val emojiReactions: RealmList = RealmList() fun getUri(): Uri { diff --git a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt index 15f1fdd0..8c648249 100644 --- a/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt +++ b/domain/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepository.kt @@ -36,4 +36,4 @@ interface EmojiReactionRepository { ) fun deleteAndReparseAllEmojiReactions(realm: Realm) -} \ No newline at end of file +} diff --git a/presentation/build.gradle b/presentation/build.gradle index aecce717..ef9cd9c0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -95,13 +95,6 @@ android { signingConfigs.release.keyAlias = System.getenv("key_alias") signingConfigs.release.keyPassword = System.getenv("key_password") } - - bundle { - language { - // avoid splitting out languages because we want to handle an emoji reaction in any language - enableSplit = false - } - } } androidExtensions { From e30bf373481f34941e0f04cba82dc951b893da95 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sat, 13 Sep 2025 02:05:06 -0400 Subject: [PATCH 89/99] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- data/src/main/assets/emojis/en.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/src/main/assets/emojis/en.json b/data/src/main/assets/emojis/en.json index 513b7e47..e36ffacd 100644 --- a/data/src/main/assets/emojis/en.json +++ b/data/src/main/assets/emojis/en.json @@ -1,22 +1,22 @@ { - "emoji_reaction_ios_generic_added": "^Reacted (.+?) to “(.+?)”$", - "emoji_reaction_ios_generic_removed": "^Removed (.+?) from “(.+?)”$", + "emoji_reaction_ios_generic_added": "^(?s)Reacted (.+?) to “(.+?)”$", + "emoji_reaction_ios_generic_removed": "^(?s)Removed (.+?) from “(.+?)”$", - "emoji_reaction_ios_heart_added": "^Loved “(.+?)”$", - "emoji_reaction_ios_heart_removed": "^Removed a heart from “(.+?)”$", + "emoji_reaction_ios_heart_added": "^(?s)Loved “(.+?)”$", + "emoji_reaction_ios_heart_removed": "^(?s)Removed a heart from “(.+?)”$", - "emoji_reaction_ios_like_added": "^Liked “(.+?)”$", - "emoji_reaction_ios_like_removed": "^Removed a like from “(.+?)”$", + "emoji_reaction_ios_like_added": "^(?s)Liked “(.+?)”$", + "emoji_reaction_ios_like_removed": "^(?s)Removed a like from “(.+?)”$", - "emoji_reaction_ios_dislike_added": "^Disliked “(.+?)”$", - "emoji_reaction_ios_dislike_removed": "^Removed a dislike from “(.+?)”$", + "emoji_reaction_ios_dislike_added": "^(?s)Disliked “(.+?)”$", + "emoji_reaction_ios_dislike_removed": "^(?s)Removed a dislike from “(.+?)”$", - "emoji_reaction_ios_laugh_added": "^Laughed at “(.+?)”$", - "emoji_reaction_ios_laugh_removed": "^Removed a laugh from “(.+?)”$", + "emoji_reaction_ios_laugh_added": "^(?s)Laughed at “(.+?)”$", + "emoji_reaction_ios_laugh_removed": "^(?s)Removed a laugh from “(.+?)”$", - "emoji_reaction_ios_exclamation_added": "^Emphasized “(.+?)”$", - "emoji_reaction_ios_exclamation_removed": "^Removed an exclamation from “(.+?)”$", + "emoji_reaction_ios_exclamation_added": "^(?s)Emphasized “(.+?)”$", + "emoji_reaction_ios_exclamation_removed": "^(?s)Removed an exclamation from “(.+?)”$", - "emoji_reaction_ios_question_mark_added": "^Questioned “(.+?)”$", - "emoji_reaction_ios_question_mark_removed": "^Removed a question mark from “(.+?)”$" + "emoji_reaction_ios_question_mark_added": "^(?s)Questioned “(.+?)”$", + "emoji_reaction_ios_question_mark_removed": "^(?s)Removed a question mark from “(.+?)”$" } From fb28453b39dee71f040f414fb755037b20051ec2 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sat, 13 Sep 2025 02:05:13 -0400 Subject: [PATCH 90/99] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- data/src/main/assets/emojis/ru.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/src/main/assets/emojis/ru.json b/data/src/main/assets/emojis/ru.json index c6416422..f93d0e96 100644 --- a/data/src/main/assets/emojis/ru.json +++ b/data/src/main/assets/emojis/ru.json @@ -1,13 +1,13 @@ { - "emoji_reaction_ios_heart_added": "^Очень понравилось «(.+?)»$", + "emoji_reaction_ios_heart_added": "^(?s)Очень понравилось «(.+?)»$", - "emoji_reaction_ios_like_added": "^Понравилось «(.+?)»$", + "emoji_reaction_ios_like_added": "^(?s)Понравилось «(.+?)»$", - "emoji_reaction_ios_dislike_added": "^Не понравилось «(.+?)»$", + "emoji_reaction_ios_dislike_added": "^(?s)Не понравилось «(.+?)»$", - "emoji_reaction_ios_laugh_added": "^Посмеялись над «(.+?)»$", + "emoji_reaction_ios_laugh_added": "^(?s)Посмеялись над «(.+?)»$", - "emoji_reaction_ios_exclamation_added": "^Отмечено «(.+?)»$", + "emoji_reaction_ios_exclamation_added": "^(?s)Отмечено «(.+?)»$", - "emoji_reaction_ios_question_mark_added": "^Поставлен вопрос на «(.+?)»$" + "emoji_reaction_ios_question_mark_added": "^(?s)Поставлен вопрос на «(.+?)»$" } From ed63d27511dac290e0aa63232426848c49d4cff4 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 17:21:16 -0400 Subject: [PATCH 91/99] fix emoji count wrapping --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 5 +++-- presentation/src/main/res/layout/message_list_item_in.xml | 3 ++- presentation/src/main/res/layout/message_list_item_out.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index a9cc89f1..b23c926a 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -411,7 +411,8 @@ class MessagesAdapter @Inject constructor( val reactionText = if (topReaction.second == 1) { topReaction.first } else { - "${topReaction.first} ${topReaction.second}" + // Use a non-breaking space to keep the emoji and count together + "${topReaction.first}\u00A0${topReaction.second}" } holder.reactionText?.text = reactionText @@ -516,4 +517,4 @@ class MessagesAdapter @Inject constructor( } } -} \ No newline at end of file +} diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 0006b0dd..42b000fd 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -145,6 +145,7 @@ android:background="@drawable/message_only" android:backgroundTint="?android:attr/colorBackground" android:elevation="2dp" + android:maxLines="1" android:paddingStart="8dp" android:paddingTop="4dp" android:paddingEnd="8dp" @@ -176,4 +177,4 @@ -
\ No newline at end of file + diff --git a/presentation/src/main/res/layout/message_list_item_out.xml b/presentation/src/main/res/layout/message_list_item_out.xml index 6c327730..f93de76d 100644 --- a/presentation/src/main/res/layout/message_list_item_out.xml +++ b/presentation/src/main/res/layout/message_list_item_out.xml @@ -183,6 +183,7 @@ android:background="@drawable/message_only" android:backgroundTint="?android:attr/colorBackground" android:elevation="2dp" + android:maxLines="1" android:paddingStart="8dp" android:paddingTop="4dp" android:paddingEnd="8dp" @@ -250,4 +251,4 @@ - \ No newline at end of file + From dbecaf12a48cf77930285a3fa53d8330abc79a95 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 17:46:19 -0400 Subject: [PATCH 92/99] Show emoji reaction messages if target isn't found --- .../moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 5aa6607e..95fb48b7 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -190,7 +190,6 @@ class EmojiReactionRepositoryImpl @Inject constructor( ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") - reactionMessage.isEmojiReaction = true return } @@ -229,14 +228,13 @@ class EmojiReactionRepositoryImpl @Inject constructor( } realm.insertOrUpdate(reaction) - reactionMessage.isEmojiReaction = true - if (targetMessage != null) { + reactionMessage.isEmojiReaction = true targetMessage.emojiReactions.add(reaction) Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") } else { - Timber.w("Saved emoji reaction without target message: ${reaction.emoji}") + Timber.w("No target message, cannot save emoji reaction: ${reaction.emoji}") } } From a4e2ced6d87f0ec7a734d6bfb0ebeaf98b253a96 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 13 Sep 2025 18:02:35 -0400 Subject: [PATCH 93/99] overwrite emoji reactions with newer ones --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 95fb48b7..2a2b3324 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -230,6 +230,11 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage != null) { reactionMessage.isEmojiReaction = true + + // Overwrite any previous reaction from this sender for this target + val priorFromSender = targetMessage.emojiReactions.filter { it.senderAddress == reaction.senderAddress } + priorFromSender.forEach { it.deleteFromRealm() } + targetMessage.emojiReactions.add(reaction) Timber.i("Saved emoji reaction: ${reaction.emoji} to message ${targetMessage.id}") From f7ad9fe3a0d83aa530fd28f0d57e13c944f6609e Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Sun, 21 Sep 2025 23:38:14 -0400 Subject: [PATCH 94/99] Apply suggestion from @Inhishonor Co-authored-by: Inhishonor --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 2a2b3324..28277ee1 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -258,8 +258,9 @@ class EmojiReactionRepositoryImpl @Inject constructor( .isNotEmpty("body") .endGroup() .or() - .beginGroup() + .beginGroup() .equalTo("type", "mms") + .notEqualTo("messageType", 130.toLong()) .isNotEmpty("parts.text") .endGroup() .endGroup() From 3ef51b74fe906eaf5dc9a72025f795ddad197fd2 Mon Sep 17 00:00:00 2001 From: Ben Iofel <1713819+benwaffle@users.noreply.github.com> Date: Mon, 22 Sep 2025 12:55:20 -0400 Subject: [PATCH 95/99] Update data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt Co-authored-by: Inhishonor --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 28277ee1..f081e490 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -258,7 +258,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( .isNotEmpty("body") .endGroup() .or() - .beginGroup() + .beginGroup() .equalTo("type", "mms") .notEqualTo("messageType", 130.toLong()) .isNotEmpty("parts.text") From 2511ed1a5e76f4fc940de15d050605a80b868206 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Sat, 27 Sep 2025 13:12:33 -0400 Subject: [PATCH 96/99] log --- .../com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index f081e490..f9298dd2 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -169,7 +169,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( .sort("date", Sort.DESCENDING) .findAll() val endTime = System.currentTimeMillis() - Timber.d("Found ${messages.size} messages as emoji targets in ${endTime - startTime}ms") + Timber.d("Found ${messages.size} messages as potential emoji targets in ${endTime - startTime}ms") val match = messages.find { message -> message.getText(false).trim() == originalMessageText.trim() From 51aa16a12193f66bc9531813b718c52c5296b466 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Mon, 29 Sep 2025 11:44:21 -0400 Subject: [PATCH 97/99] Fix closed Realm instance during send I found a bug where sending messages doesn't work: 1. Quit the app (swipe it away in the Recent Apps view) 2. Open QUIK 3. Send a message 4. The message disappears 5. This is logged: ``` 2025-09-29 10:30:29.806 3110-3110 Interactor$execute dev.octoshrimpy.quik.debug W java.lang.IllegalStateException: This Realm instance has already been closed, making it unusable. at io.realm.BaseRealm.checkIfValid(BaseRealm.java:525) at io.realm.dev_octoshrimpy_quik_model_ConversationRealmProxy.realmGet$id(dev_octoshrimpy_quik_model_ConversationRealmProxy.java:130) at dev.octoshrimpy.quik.model.Conversation.getId(Conversation.kt:27) at dev.octoshrimpy.quik.interactor.SendMessage$buildObservable$2.invoke(SendMessage.kt:51) at dev.octoshrimpy.quik.interactor.SendMessage$buildObservable$2.invoke(SendMessage.kt:48) at dev.octoshrimpy.quik.interactor.SendMessage.buildObservable$lambda$1(SendMessage.kt:48) at dev.octoshrimpy.quik.interactor.SendMessage.$r8$lambda$hlSlgpBA9ul6H285iTbkv7pF6zA(Unknown Source:0) at dev.octoshrimpy.quik.interactor.SendMessage$$ExternalSyntheticLambda1.accept(Unknown Source:2) at io.reactivex.internal.operators.flowable.FlowableDoOnEach$DoOnEachSubscriber.onNext(FlowableDoOnEach.java:86) ``` Fix below. Unsure if it's the same issue as #509 --- .../com/moez/QKSMS/repository/ConversationRepositoryImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt index ac5c0102..1fdbc0c9 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/ConversationRepositoryImpl.kt @@ -314,7 +314,7 @@ class ConversationRepositoryImpl @Inject constructor( getConversation(listOf(recipient)) override fun getConversation(recipients: Collection) = - Realm.getDefaultInstance().use { realm -> + Realm.getDefaultInstance().let { realm -> realm.refresh() realm.where(Conversation::class.java) .findAll() From e28c47320014870520e8a0b4e9ac0c185719c36b Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 1 Oct 2025 00:43:55 -0400 Subject: [PATCH 98/99] Fix visible reaction messages --- .../moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index f9298dd2..81aba099 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -20,6 +20,7 @@ package dev.octoshrimpy.quik.repository import android.content.Context import com.squareup.moshi.Moshi +import dev.octoshrimpy.quik.extensions.insertOrUpdate import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction import dev.octoshrimpy.quik.model.Message @@ -187,6 +188,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( reactionMessage: Message, reaction: ParsedEmojiReaction, targetMessage: Message?, + realm: Realm, ) { if (targetMessage == null) { Timber.w("Cannot remove emoji reaction '${reaction.emoji}': no target message found") @@ -205,6 +207,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( } reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) } override fun saveEmojiReaction( @@ -214,7 +217,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( realm: Realm, ) { if (parsedReaction.isRemoval) { - removeEmojiReaction(reactionMessage, parsedReaction, targetMessage) + removeEmojiReaction(reactionMessage, parsedReaction, targetMessage, realm) return } @@ -230,6 +233,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( if (targetMessage != null) { reactionMessage.isEmojiReaction = true + realm.insertOrUpdate(reactionMessage) // Overwrite any previous reaction from this sender for this target val priorFromSender = targetMessage.emojiReactions.filter { it.senderAddress == reaction.senderAddress } From e290545fb4078db0bae3f38bc2356358461bc802 Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Wed, 1 Oct 2025 00:57:11 -0400 Subject: [PATCH 99/99] Fix avatar alignment for incoming messages with emojis --- .../java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt | 2 +- presentation/src/main/res/layout/message_list_item_in.xml | 4 +++- presentation/src/main/res/layout/message_list_item_out.xml | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index b23c926a..b6fd29c4 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -427,7 +427,7 @@ class MessagesAdapter @Inject constructor( private fun makeRoomForEmojis(holder: QkViewHolder) { val paddingBottom = 25.dpToPx(context) - (holder.reactions?.parent as? ViewGroup)?.let { parent -> + (holder.reactions?.parent?.parent as? ViewGroup)?.let { parent -> parent.setPadding( parent.paddingLeft, parent.paddingTop, diff --git a/presentation/src/main/res/layout/message_list_item_in.xml b/presentation/src/main/res/layout/message_list_item_in.xml index 42b000fd..792727ef 100644 --- a/presentation/src/main/res/layout/message_list_item_in.xml +++ b/presentation/src/main/res/layout/message_list_item_in.xml @@ -79,7 +79,9 @@ android:layout_height="wrap_content" android:layout_marginStart="12dp" android:orientation="horizontal" - app:layout_constraintBottom_toBottomOf="parent"> + app:layout_constraintBottom_toBottomOf="parent" + android:clipToPadding="false" + android:clipChildren="false"> + android:orientation="horizontal" + android:clipChildren="false" + android:clipToPadding="false">