Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

- Sort Overdue list based on return score when feature `sort_overdue_based_on_return_score` is enabled

### Fixes

- Screenshot blocking is now controlled via Gradle property `disableScreenshot`

## 2026.03.02

### Internal
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/org/simple/clinic/main/TheActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import android.content.Intent
import android.content.res.Configuration
import android.graphics.Color
import android.os.Bundle
import android.view.WindowManager
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -14,6 +15,7 @@ import androidx.work.WorkManager
import io.github.inflationx.viewpump.ViewPumpContextWrapper
import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import org.simple.clinic.BuildConfig
import org.simple.clinic.ClinicApp
import org.simple.clinic.activity.permissions.ActivityPermissionResult
import org.simple.clinic.deeplink.DeepLinkResult
Expand Down Expand Up @@ -206,6 +208,11 @@ class TheActivity : AppCompatActivity(), TheActivityUi {
@SuppressLint("CheckResult")
override fun onPostCreate(savedInstanceState: Bundle?) {
super.onPostCreate(savedInstanceState)

if (BuildConfig.DISABLE_SCREENSHOT) {
window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
}

if (savedInstanceState == null) {
disposables.addAll(
syncSetup.run(),
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/org/simple/clinic/setup/SetupActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import android.content.Intent
import android.content.res.Configuration
import android.graphics.Color
import android.os.Bundle
import android.view.WindowManager
import androidx.activity.SystemBarStyle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import io.github.inflationx.viewpump.ViewPumpContextWrapper
import io.reactivex.Observable
import org.simple.clinic.BuildConfig
import org.simple.clinic.ClinicApp
import org.simple.clinic.R
import org.simple.clinic.activity.permissions.ActivityPermissionResult
Expand Down Expand Up @@ -86,6 +88,10 @@ class SetupActivity : AppCompatActivity(), UiActions {
)
super.onCreate(savedInstanceState)

if (BuildConfig.DISABLE_SCREENSHOT) {
window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
}

handleBackPress {
if (!router.onBackPressed()) {
isEnabled = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import org.simple.clinic.BuildConfig
import org.simple.clinic.databinding.BottomSheetBinding
import org.simple.clinic.util.disablePendingTransitions
import org.simple.clinic.util.handleBackPress
Expand All @@ -30,6 +32,10 @@ abstract class BottomSheetActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
disablePendingTransitions()
super.onCreate(savedInstanceState)
if (BuildConfig.DISABLE_SCREENSHOT) {
window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
}

bottomSheetBinding = BottomSheetBinding.inflate(layoutInflater)
super.setContentView(bottomSheetBinding.root)

Expand Down
Loading