Merge branch 'master' into upgrade-smsmms-group-individual-send-no-wait-appear-delayed-mms-mms-receive-to-worker-send-ack-mmsc

This commit is contained in:
Inhishonor
2025-10-09 18:01:59 -07:00
254 changed files with 2886 additions and 1596 deletions
@@ -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
@@ -30,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
@@ -43,8 +46,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
@@ -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)
@@ -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
@@ -40,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
@@ -79,16 +81,16 @@ 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
import dev.octoshrimpy.quik.repository.MessageRepositoryImpl
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
@@ -143,9 +145,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
@@ -204,6 +203,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
@@ -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
@@ -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 {
@@ -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
@@ -32,8 +34,6 @@ import dev.octoshrimpy.quik.receiver.SendScheduledMessageReceiver
import dev.octoshrimpy.quik.receiver.MessageDeliveredReceiver
import dev.octoshrimpy.quik.receiver.SmsProviderChangedReceiver
import dev.octoshrimpy.quik.receiver.SmsReceivedReceiver
import dagger.Module
import dagger.android.ContributesAndroidInjector
import dev.octoshrimpy.quik.receiver.MessageMarkReceiver
import dev.octoshrimpy.quik.receiver.MessageSentReceiver
import dev.octoshrimpy.quik.receiver.SendDelayedMessageReceiver
@@ -18,12 +18,12 @@
*/
package dev.octoshrimpy.quik.injection.android
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.service.HeadlessSmsSendService
import dev.octoshrimpy.quik.service.AutoDeleteService
import dagger.Module
import dagger.android.ContributesAndroidInjector
@Module
abstract class ServiceBuilderModule {