From fe523da6ed7aaa071e5111c98aa12998f98debfe Mon Sep 17 00:00:00 2001 From: tom5079 Date: Mon, 13 May 2019 21:45:18 +0900 Subject: [PATCH] Security mode toggle added --- .../xyz/quaver/pupil/ExampleInstrumentedTest.kt | 1 + .../java/xyz/quaver/pupil/GalleryActivity.kt | 12 ++++++++++++ .../main/java/xyz/quaver/pupil/MainActivity.kt | 16 ++++++++++++---- .../java/xyz/quaver/pupil/SettingsActivity.kt | 13 +++++++++++++ app/src/main/res/values-ja/strings.xml | 4 +++- app/src/main/res/values-ko/strings.xml | 4 +++- app/src/main/res/values/strings.xml | 4 +++- app/src/main/res/xml/root_preferences.xml | 8 +++++++- 8 files changed, 54 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt index 41211cc7..5a6f14f7 100644 --- a/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/xyz/quaver/pupil/ExampleInstrumentedTest.kt @@ -41,5 +41,6 @@ class ExampleInstrumentedTest { @Test fun test_doSearch() { + } } diff --git a/app/src/main/java/xyz/quaver/pupil/GalleryActivity.kt b/app/src/main/java/xyz/quaver/pupil/GalleryActivity.kt index 00cbf6e8..24fe0795 100644 --- a/app/src/main/java/xyz/quaver/pupil/GalleryActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/GalleryActivity.kt @@ -56,6 +56,18 @@ class GalleryActivity : AppCompatActivity() { loadImages() } + override fun onResume() { + val preferences = android.preference.PreferenceManager.getDefaultSharedPreferences(this) + + if (preferences.getBoolean("security_mode", false)) + window.setFlags( + WindowManager.LayoutParams.FLAG_SECURE, + WindowManager.LayoutParams.FLAG_SECURE) + else + window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) + super.onResume() + } + override fun onDestroy() { super.onDestroy() loadJob?.cancel() diff --git a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt index 1b48419e..65ea4cec 100644 --- a/app/src/main/java/xyz/quaver/pupil/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/MainActivity.kt @@ -67,10 +67,6 @@ class MainActivity : AppCompatActivity() { Histories.default = Histories(File(cacheDir, "histories.json")) super.onCreate(savedInstanceState) - window.setFlags( - WindowManager.LayoutParams.FLAG_SECURE, - WindowManager.LayoutParams.FLAG_SECURE) - setContentView(R.layout.activity_main) checkPermission() @@ -132,6 +128,18 @@ class MainActivity : AppCompatActivity() { super.onBackPressed() } + override fun onResume() { + val preferences = PreferenceManager.getDefaultSharedPreferences(this) + + if (preferences.getBoolean("security_mode", false)) + window.setFlags( + WindowManager.LayoutParams.FLAG_SECURE, + WindowManager.LayoutParams.FLAG_SECURE) + else + window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) + super.onResume() + } + private fun checkPermission() { val permissions = arrayOf( Manifest.permission.WRITE_EXTERNAL_STORAGE diff --git a/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt b/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt index b9d95dda..d5c301ce 100644 --- a/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/SettingsActivity.kt @@ -1,6 +1,7 @@ package xyz.quaver.pupil import android.os.Bundle +import android.preference.PreferenceManager import android.view.MenuItem import android.view.WindowManager import androidx.appcompat.app.AlertDialog @@ -27,6 +28,18 @@ class SettingsActivity : AppCompatActivity() { supportActionBar?.setDisplayHomeAsUpEnabled(true) } + override fun onResume() { + val preferences = PreferenceManager.getDefaultSharedPreferences(this) + + if (preferences.getBoolean("security_mode", false)) + window.setFlags( + WindowManager.LayoutParams.FLAG_SECURE, + WindowManager.LayoutParams.FLAG_SECURE) + else + window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) + super.onResume() + } + class SettingsFragment : PreferenceFragmentCompat() { private val suffix = listOf( diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f79d7c26..b102b437 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -18,7 +18,7 @@ アップデートダウンロード中 新しいアップデートがあります 注意 - イメージロード + その他 ロード速度を向上させるためhiyobi.meからイメージロード hiyobi.meからロード 履歴の削除 @@ -28,4 +28,6 @@ トップ ダウンロード中 # リリースノート(v%1$s)\n%2$s + セキュリティーモード + アプリ履歴でアプリの画面を表示しない \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 309a4a2d..95f970f6 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -18,7 +18,7 @@ 결과 없음 검색 캐시 - 이미지 로딩 + 기타 속도 향상을 위해 가능하면 hiyobi.me에서 이미지 로드 hiyobi.me 사용 히스토리 삭제 @@ -28,4 +28,6 @@ 홈 다운로드 중 # 릴리즈 노트(v%1$s)\n%2$s + 최근 앱 목록 창에서 앱 화면을 보이지 않게 합니다 + 보안 모드 활성화 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3fc93060..ac81600a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -43,8 +43,10 @@ Clear history Do you want to clear histories? %1$d histories saved - Image Loading + Miscellaneous Use hiyobi.me Load images from hiyobi.me to improve loading speed (if available) + Enable security mode + Enable security mode to make the screen invisible on recent app window diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 5dbfcadf..9ad7233a 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -35,13 +35,19 @@ + app:title="@string/settings_miscellaneous_title"> + +