From e1d81a9c023282a833573d5c2b5864627a242c7e Mon Sep 17 00:00:00 2001 From: inhishonor Date: Sun, 23 Mar 2025 16:36:32 -0700 Subject: [PATCH] Added setting to disable screenshots --- .../java/com/moez/QKSMS/util/Preferences.kt | 1 + .../com/moez/QKSMS/common/base/QkActivity.kt | 18 ++++++++++++++++++ .../moez/QKSMS/common/base/QkThemedActivity.kt | 2 -- .../feature/settings/SettingsController.kt | 2 ++ .../feature/settings/SettingsPresenter.kt | 4 ++++ .../QKSMS/feature/settings/SettingsState.kt | 1 + .../src/main/res/drawable/ic_screenshot.xml | 10 ++++++++++ .../main/res/layout/settings_controller.xml | 9 +++++++++ presentation/src/main/res/values/strings.xml | 2 ++ 9 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 presentation/src/main/res/drawable/ic_screenshot.xml diff --git a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt index df81490f..16857073 100644 --- a/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt +++ b/domain/src/main/java/com/moez/QKSMS/util/Preferences.kt @@ -132,6 +132,7 @@ class Preferences @Inject constructor( val longAsMms = rxPrefs.getBoolean("longAsMms", false) val mmsSize = rxPrefs.getInteger("mmsSize", 300) val messageLinkHandling = rxPrefs.getInteger("messageLinkHandling", MESSAGE_LINK_HANDLING_ASK) + val disableScreenshots = rxPrefs.getBoolean("disableScreenshots", false) val logging = rxPrefs.getBoolean("logging", false) val unreadAtTop = rxPrefs.getBoolean("unreadAtTop", false) 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 b06bd3d5..89a583fe 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,12 +22,16 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem +import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity +import dev.octoshrimpy.quik.util.Preferences import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.toolbar.* +import javax.inject.Inject abstract class QkActivity : AppCompatActivity() { + @Inject lateinit var prefs: Preferences protected val menu: Subject = BehaviorSubject.create() @@ -35,6 +39,12 @@ abstract class QkActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) onNewIntent(intent) + disableScreenshots(prefs.disableScreenshots.get()) + } + + override fun onResume() { + super.onResume() + disableScreenshots(prefs.disableScreenshots.get()) } override fun onOptionsItemSelected(item: MenuItem): Boolean { @@ -74,4 +84,12 @@ abstract class QkActivity : AppCompatActivity() { supportActionBar?.setDisplayHomeAsUpEnabled(show) } + private fun disableScreenshots(disableScreenshots: Boolean) { + if (disableScreenshots) { + window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE) + } else { + window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) + } + } + } \ No newline at end of file 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 f6d0b9fb..d1a3efe3 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 @@ -36,7 +36,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 dev.octoshrimpy.quik.util.Preferences import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.autoDisposable import io.reactivex.Observable @@ -60,7 +59,6 @@ abstract class QkThemedActivity : QkActivity() { @Inject lateinit var conversationRepo: ConversationRepository @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var phoneNumberUtils: PhoneNumberUtils - @Inject lateinit var prefs: Preferences /** * In case the activity should be themed for a specific conversation, the selected conversation 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 54defd2d..2e93f785 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 @@ -203,6 +203,8 @@ class SettingsController : QkController syncingProgress.isVisible = false 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 15e0f580..22bb75c9 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 @@ -153,6 +153,8 @@ class SettingsPresenter @Inject constructor( ) } } + disposables += prefs.disableScreenshots.asObservable() + .subscribe { enabled -> newState { copy(disableScreenshotsEnabled = enabled) } } disposables += syncRepo.syncProgress .sample(16, TimeUnit.MILLISECONDS) @@ -228,6 +230,8 @@ class SettingsPresenter @Inject constructor( R.id.messsageLinkHandling -> view.showMessageLinkHandlingDialogPicker() + R.id.disableScreenshots -> prefs.disableScreenshots.set(!prefs.disableScreenshots.get()) + R.id.sync -> syncMessages.execute(Unit) R.id.about -> view.showAbout() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt index 0b8b270d..cdb304b5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsState.kt @@ -51,5 +51,6 @@ data class SettingsState( val maxMmsSizeId: Int = 100, val messageLinkHandlingSummary: String = "Ask before opening", val messageLinkHandlingId: Int = 2, + val disableScreenshotsEnabled: Boolean = false, val syncProgress: SyncRepository.SyncProgress = SyncRepository.SyncProgress.Idle ) \ No newline at end of file diff --git a/presentation/src/main/res/drawable/ic_screenshot.xml b/presentation/src/main/res/drawable/ic_screenshot.xml new file mode 100644 index 00000000..d35477cf --- /dev/null +++ b/presentation/src/main/res/drawable/ic_screenshot.xml @@ -0,0 +1,10 @@ + + + diff --git a/presentation/src/main/res/layout/settings_controller.xml b/presentation/src/main/res/layout/settings_controller.xml index 753697d6..338142d3 100644 --- a/presentation/src/main/res/layout/settings_controller.xml +++ b/presentation/src/main/res/layout/settings_controller.xml @@ -229,6 +229,15 @@ app:title="@string/settings_mms_weblink_title" tools:summary="100KB" /> + + If your longer text messages are failing to send, or sending in the wrong order, you can send them as MMS messages instead. Additional charges may apply Auto-compress MMS image attachments Link handling in messages + Disable Screenshots + Prevent your OS and other apps from taking screenshots of the app. Sync messages Re-sync your messages with the native Android SMS database About QUIK