Remove SMS export.

2026-04-23 18:30:20 +01:00 · 2024-01-24 16:04:08 -05:00
parent 98865d61dd
commit aa33fd44b8
93 changed files with 3 additions and 5407 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsFragment.kt
@@ -1,26 +1,18 @@
 package org.thoughtcrime.securesms.components.settings.app.chats

-import android.app.Activity
-import android.content.Intent
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.Navigation
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.chats.sms.SmsExportState
 import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.exporter.flow.SmsExportActivity
-import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate

 class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__chats) {

  private lateinit var viewModel: ChatsSettingsViewModel
-  private lateinit var smsExportLauncher: ActivityResultLauncher<Intent>

  override fun onResume() {
    super.onResume()
@@ -29,12 +21,6 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch

  @Suppress("ReplaceGetOrSet")
  override fun bindAdapter(adapter: MappingAdapter) {
-    smsExportLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-      if (it.resultCode == Activity.RESULT_OK) {
-        SmsExportDialogs.showSmsRemovalDialog(requireContext(), requireView())
-      }
-    }
-
    viewModel = ViewModelProvider(this).get(ChatsSettingsViewModel::class.java)

    viewModel.state.observe(viewLifecycleOwner) {
@@ -44,55 +30,6 @@ class ChatsSettingsFragment : DSLSettingsFragment(R.string.preferences_chats__ch

  private fun getConfiguration(state: ChatsSettingsState): DSLConfiguration {
    return configure {
-      if (!state.useAsDefaultSmsApp) {
-        when (state.smsExportState) {
-          SmsExportState.FETCHING -> Unit
-          SmsExportState.HAS_UNEXPORTED_MESSAGES -> {
-            clickPref(
-              title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages),
-              summary = DSLSettingsText.from(R.string.SmsSettingsFragment__you_can_export_your_sms_messages_to_your_phones_sms_database),
-              onClick = {
-                smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext()))
-              }
-            )
-
-            dividerPref()
-          }
-          SmsExportState.ALL_MESSAGES_EXPORTED -> {
-            clickPref(
-              title = DSLSettingsText.from(R.string.SmsSettingsFragment__remove_sms_messages),
-              summary = DSLSettingsText.from(R.string.SmsSettingsFragment__remove_sms_messages_from_signal_to_clear_up_storage_space),
-              onClick = {
-                SmsExportDialogs.showSmsRemovalDialog(requireContext(), requireView())
-              }
-            )
-
-            clickPref(
-              title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages_again),
-              summary = DSLSettingsText.from(R.string.SmsSettingsFragment__exporting_again_can_result_in_duplicate_messages),
-              onClick = {
-                SmsExportDialogs.showSmsReExportDialog(requireContext()) {
-                  smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext(), isReExport = true))
-                }
-              }
-            )
-
-            dividerPref()
-          }
-          SmsExportState.NO_SMS_MESSAGES_IN_DATABASE -> Unit
-          SmsExportState.NOT_AVAILABLE -> Unit
-        }
-      } else {
-        clickPref(
-          title = DSLSettingsText.from(R.string.preferences__sms_mms),
-          onClick = {
-            Navigation.findNavController(requireView()).safeNavigate(R.id.action_chatsSettingsFragment_to_smsSettingsFragment)
-          }
-        )
-
-        dividerPref()
-      }
-
      switchPref(
        title = DSLSettingsText.from(R.string.preferences__generate_link_previews),
        summary = DSLSettingsText.from(R.string.preferences__retrieve_link_previews_from_websites_for_messages),
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsState.kt
@@ -1,14 +1,10 @@
 package org.thoughtcrime.securesms.components.settings.app.chats

-import org.thoughtcrime.securesms.components.settings.app.chats.sms.SmsExportState
-
 data class ChatsSettingsState(
  val generateLinkPreviews: Boolean,
  val useAddressBook: Boolean,
  val keepMutedChatsArchived: Boolean,
  val useSystemEmoji: Boolean,
  val enterKeySends: Boolean,
-  val chatBackupsEnabled: Boolean,
-  val useAsDefaultSmsApp: Boolean,
-  val smsExportState: SmsExportState = SmsExportState.FETCHING
+  val chatBackupsEnabled: Boolean
 )
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/ChatsSettingsViewModel.kt
@@ -2,24 +2,18 @@ package org.thoughtcrime.securesms.components.settings.app.chats

 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import org.thoughtcrime.securesms.components.settings.app.chats.sms.SmsSettingsRepository
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.ThrottledDebouncer
-import org.thoughtcrime.securesms.util.Util
 import org.thoughtcrime.securesms.util.livedata.Store

 class ChatsSettingsViewModel @JvmOverloads constructor(
-  private val repository: ChatsSettingsRepository = ChatsSettingsRepository(),
-  smsSettingsRepository: SmsSettingsRepository = SmsSettingsRepository()
+  private val repository: ChatsSettingsRepository = ChatsSettingsRepository()
 ) : ViewModel() {

  private val refreshDebouncer = ThrottledDebouncer(500L)
-  private val disposables = CompositeDisposable()

  private val store: Store<ChatsSettingsState> = Store(
    ChatsSettingsState(
@@ -28,23 +22,12 @@ class ChatsSettingsViewModel @JvmOverloads constructor(
      keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
      useSystemEmoji = SignalStore.settings().isPreferSystemEmoji,
      enterKeySends = SignalStore.settings().isEnterKeySends,
-      chatBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication()),
-      useAsDefaultSmsApp = Util.isDefaultSmsProvider(ApplicationDependencies.getApplication())
+      chatBackupsEnabled = SignalStore.settings().isBackupEnabled && BackupUtil.canUserAccessBackupDirectory(ApplicationDependencies.getApplication())
    )
  )

  val state: LiveData<ChatsSettingsState> = store.stateLiveData

-  init {
-    disposables += smsSettingsRepository.getSmsExportState().subscribe { state ->
-      store.update { it.copy(smsExportState = state) }
-    }
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
  fun setGenerateLinkPreviewsEnabled(enabled: Boolean) {
    store.update { it.copy(generateLinkPreviews = enabled) }
    SignalStore.settings().isLinkPreviewsEnabled = enabled
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsExportState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsExportState.kt
@@ -1,9 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.chats.sms
-
-enum class SmsExportState {
-  FETCHING,
-  HAS_UNEXPORTED_MESSAGES,
-  ALL_MESSAGES_EXPORTED,
-  NO_SMS_MESSAGES_IN_DATABASE,
-  NOT_AVAILABLE
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsFragment.kt
@@ -1,153 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.chats.sms
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Intent
-import android.os.Build
-import android.provider.Settings
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.components.settings.models.OutlinedLearnMore
-import org.thoughtcrime.securesms.exporter.flow.SmsExportActivity
-import org.thoughtcrime.securesms.exporter.flow.SmsExportDialogs
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.Util
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-
-private const val SMS_REQUEST_CODE: Short = 1234
-
-class SmsSettingsFragment : DSLSettingsFragment(R.string.preferences__sms_mms) {
-
-  private lateinit var viewModel: SmsSettingsViewModel
-  private lateinit var smsExportLauncher: ActivityResultLauncher<Intent>
-
-  override fun onResume() {
-    super.onResume()
-    viewModel.checkSmsEnabled()
-  }
-
-  override fun bindAdapter(adapter: MappingAdapter) {
-    OutlinedLearnMore.register(adapter)
-
-    smsExportLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-      if (it.resultCode == Activity.RESULT_OK) {
-        SmsExportDialogs.showSmsRemovalDialog(requireContext(), requireView())
-      }
-    }
-
-    viewModel = ViewModelProvider(this)[SmsSettingsViewModel::class.java]
-
-    viewModel.state.observe(viewLifecycleOwner) {
-      adapter.submitList(getConfiguration(it).toMappingModelList())
-    }
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    if (Util.isDefaultSmsProvider(requireContext())) {
-      SignalStore.settings().setDefaultSms(true)
-    } else {
-      SignalStore.settings().setDefaultSms(false)
-      findNavController().navigateUp()
-    }
-  }
-
-  private fun getConfiguration(state: SmsSettingsState): DSLConfiguration {
-    return configure {
-      if (state.useAsDefaultSmsApp) {
-        customPref(
-          OutlinedLearnMore.Model(
-            summary = DSLSettingsText.from(R.string.SmsSettingsFragment__sms_support_will_be_removed_soon_to_focus_on_encrypted_messaging),
-            learnMoreUrl = getString(R.string.sms_export_url)
-          )
-        )
-      }
-
-      when (state.smsExportState) {
-        SmsExportState.FETCHING -> Unit
-        SmsExportState.HAS_UNEXPORTED_MESSAGES -> {
-          clickPref(
-            title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages),
-            summary = DSLSettingsText.from(R.string.SmsSettingsFragment__you_can_export_your_sms_messages_to_your_phones_sms_database),
-            onClick = {
-              smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext()))
-            }
-          )
-
-          dividerPref()
-        }
-        SmsExportState.ALL_MESSAGES_EXPORTED -> {
-          clickPref(
-            title = DSLSettingsText.from(R.string.SmsSettingsFragment__remove_sms_messages),
-            summary = DSLSettingsText.from(R.string.SmsSettingsFragment__remove_sms_messages_from_signal_to_clear_up_storage_space),
-            onClick = {
-              SmsExportDialogs.showSmsRemovalDialog(requireContext(), requireView())
-            }
-          )
-
-          clickPref(
-            title = DSLSettingsText.from(R.string.SmsSettingsFragment__export_sms_messages_again),
-            summary = DSLSettingsText.from(R.string.SmsSettingsFragment__exporting_again_can_result_in_duplicate_messages),
-            onClick = {
-              SmsExportDialogs.showSmsReExportDialog(requireContext()) {
-                smsExportLauncher.launch(SmsExportActivity.createIntent(requireContext(), isReExport = true))
-              }
-            }
-          )
-
-          dividerPref()
-        }
-        SmsExportState.NO_SMS_MESSAGES_IN_DATABASE -> Unit
-        SmsExportState.NOT_AVAILABLE -> Unit
-      }
-
-      if (state.useAsDefaultSmsApp) {
-        @Suppress("DEPRECATION")
-        clickPref(
-          title = DSLSettingsText.from(R.string.SmsSettingsFragment__use_as_default_sms_app),
-          summary = DSLSettingsText.from(R.string.arrays__enabled),
-          onClick = {
-            startDefaultAppSelectionIntent()
-          }
-        )
-      }
-
-      switchPref(
-        title = DSLSettingsText.from(R.string.preferences__sms_delivery_reports),
-        summary = DSLSettingsText.from(R.string.preferences__request_a_delivery_report_for_each_sms_message_you_send),
-        isChecked = state.smsDeliveryReportsEnabled,
-        onClick = {
-          viewModel.setSmsDeliveryReportsEnabled(!state.smsDeliveryReportsEnabled)
-        }
-      )
-
-      switchPref(
-        title = DSLSettingsText.from(R.string.preferences__support_wifi_calling),
-        summary = DSLSettingsText.from(R.string.preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi),
-        isChecked = state.wifiCallingCompatibilityEnabled,
-        onClick = {
-          viewModel.setWifiCallingCompatibilityEnabled(!state.wifiCallingCompatibilityEnabled)
-        }
-      )
-    }
-  }
-
-  // Linter isn't smart enough to figure out the else only happens if API >= 24
-  @SuppressLint("InlinedApi")
-  @Suppress("DEPRECATION")
-  private fun startDefaultAppSelectionIntent() {
-    val intent: Intent = when {
-      Build.VERSION.SDK_INT < 23 -> Intent(Settings.ACTION_WIRELESS_SETTINGS)
-      Build.VERSION.SDK_INT < 24 -> Intent(Settings.ACTION_SETTINGS)
-      else -> Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS)
-    }
-
-    startActivityForResult(intent, SMS_REQUEST_CODE.toInt())
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsRepository.kt
@@ -1,40 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.chats.sms
-
-import androidx.annotation.WorkerThread
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-
-class SmsSettingsRepository(
-  private val smsDatabase: MessageTable = SignalDatabase.messages,
-  private val mmsDatabase: MessageTable = SignalDatabase.messages
-) {
-  fun getSmsExportState(): Single<SmsExportState> {
-    return Single.fromCallable {
-      checkInsecureMessageCount() ?: checkUnexportedInsecureMessageCount()
-    }.subscribeOn(Schedulers.io())
-  }
-
-  @WorkerThread
-  private fun checkInsecureMessageCount(): SmsExportState? {
-    val totalSmsMmsCount = smsDatabase.getInsecureMessageCount() + mmsDatabase.getInsecureMessageCount()
-
-    return if (totalSmsMmsCount == 0) {
-      SmsExportState.NO_SMS_MESSAGES_IN_DATABASE
-    } else {
-      null
-    }
-  }
-
-  @WorkerThread
-  private fun checkUnexportedInsecureMessageCount(): SmsExportState {
-    val totalUnexportedCount = smsDatabase.getUnexportedInsecureMessagesCount() + mmsDatabase.getUnexportedInsecureMessagesCount()
-
-    return if (totalUnexportedCount > 0) {
-      SmsExportState.HAS_UNEXPORTED_MESSAGES
-    } else {
-      SmsExportState.ALL_MESSAGES_EXPORTED
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsState.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsState.kt
@@ -1,8 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.chats.sms
-
-data class SmsSettingsState(
-  val useAsDefaultSmsApp: Boolean,
-  val smsDeliveryReportsEnabled: Boolean,
-  val wifiCallingCompatibilityEnabled: Boolean,
-  val smsExportState: SmsExportState = SmsExportState.FETCHING
-)
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/chats/sms/SmsSettingsViewModel.kt
@@ -1,50 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.chats.sms
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.Util
-import org.thoughtcrime.securesms.util.livedata.Store
-
-class SmsSettingsViewModel : ViewModel() {
-
-  private val repository = SmsSettingsRepository()
-
-  private val disposables = CompositeDisposable()
-  private val store = Store(
-    SmsSettingsState(
-      useAsDefaultSmsApp = Util.isDefaultSmsProvider(ApplicationDependencies.getApplication()),
-      smsDeliveryReportsEnabled = SignalStore.settings().isSmsDeliveryReportsEnabled,
-      wifiCallingCompatibilityEnabled = SignalStore.settings().isWifiCallingCompatibilityModeEnabled
-    )
-  )
-
-  val state: LiveData<SmsSettingsState> = store.stateLiveData
-
-  init {
-    disposables += repository.getSmsExportState().subscribe { state ->
-      store.update { it.copy(smsExportState = state) }
-    }
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  fun setSmsDeliveryReportsEnabled(enabled: Boolean) {
-    store.update { it.copy(smsDeliveryReportsEnabled = enabled) }
-    SignalStore.settings().isSmsDeliveryReportsEnabled = enabled
-  }
-
-  fun setWifiCallingCompatibilityEnabled(enabled: Boolean) {
-    store.update { it.copy(wifiCallingCompatibilityEnabled = enabled) }
-    SignalStore.settings().isWifiCallingCompatibilityModeEnabled = enabled
-  }
-
-  fun checkSmsEnabled() {
-    store.update { it.copy(useAsDefaultSmsApp = Util.isDefaultSmsProvider(ApplicationDependencies.getApplication())) }
-  }
-}