v1.0.7 - 구글 플레이 프로텍트 유해앱 경고 원인 완벽 제거, 사용 중 전체화면 알람 즉시 표시 보장 및 설정 복귀 처리 개선

This commit is contained in:
sanjeok77
2026-08-14 10:03:47 +09:00
parent 975413a2d6
commit eb6aad8527
9 changed files with 55 additions and 171 deletions
+2 -2
View File
@@ -20,8 +20,8 @@ android {
applicationId = "com.example.shiftalarm"
minSdk = 26
targetSdk = 35
versionCode = 106
versionName = "1.0.6"
versionCode = 107
versionName = "1.0.7"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
+4 -21
View File
@@ -2,21 +2,18 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<!-- Alarm & Full Screen -->
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
<!-- Service & Notification -->
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<application
android:allowBackup="true"
@@ -42,12 +39,11 @@
android:name=".AlarmActivity"
android:exported="false"
android:excludeFromRecents="true"
android:taskAffinity=""
android:theme="@style/Theme.AppCompat.NoActionBar"
android:showWhenLocked="true"
android:turnScreenOn="true"
android:screenOrientation="portrait"
android:launchMode="singleTask"
android:launchMode="singleInstance"
android:documentLaunchMode="never"
android:configChanges="orientation|screenSize|keyboardHidden"
android:allowEmbedded="false"
@@ -94,22 +90,9 @@
<service
android:name=".AlarmForegroundService"
android:foregroundServiceType="specialUse"
android:exported="false">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="Alarm playback and ringing notification" />
</service>
android:foregroundServiceType="mediaPlayback"
android:exported="false" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
</application>
</manifest>
@@ -71,11 +71,18 @@ class AlarmForegroundService : Service() {
// 4. Foreground 시작
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // Android 14+
startForeground(NOTIFICATION_ID, notification, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE)
startForeground(NOTIFICATION_ID, notification, android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK)
} else {
startForeground(NOTIFICATION_ID, notification)
}
// 5. 사용 중일 때도 즉시 전체화면 AlarmActivity 화면 띄우기
try {
startActivity(fullScreenIntent)
} catch (e: Exception) {
e.printStackTrace()
}
return START_NOT_STICKY
}
@@ -81,32 +81,20 @@ class AlarmReceiver : BroadcastReceiver() {
Log.d(TAG, "ForegroundService 시작 완료")
// 2. AlarmActivity 직접 실행 (알람 화면 표시)
// 2. AlarmActivity 직접 즉시 실행 (사용 중일 때도 전체화면 알람 창 띄우기)
val activityIntent = Intent(context, AlarmActivity::class.java).apply {
putExtra("EXTRA_SHIFT", intent?.getStringExtra("EXTRA_SHIFT") ?: "근무")
putExtra("EXTRA_SOUND", intent?.getStringExtra("EXTRA_SOUND"))
putExtra("EXTRA_SNOOZE", intent?.getIntExtra("EXTRA_SNOOZE", 5) ?: 5)
putExtra("EXTRA_SNOOZE_REPEAT", intent?.getIntExtra("EXTRA_SNOOZE_REPEAT", 3) ?: 3)
// 중요: 새 태스크로 실행 (FLAG_ACTIVITY_NEW_TASK)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
// 기존 인스턴스 재사용 및 최상위로 가져오기
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
// 잠금 화면 위에 표시
addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT)
// 화면 켜기
addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_NO_USER_ACTION)
}
try {
context.startActivity(activityIntent)
Log.d(TAG, "AlarmActivity 즉시 실행 완료")
} catch (e: Exception) {
Log.e(TAG, "AlarmActivity 실행 실패", e)
}
// 지연 후 Activity 시작 (ForegroundService가 알림을 먼저 표시하도록)
android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
try {
context.startActivity(activityIntent)
Log.d(TAG, "AlarmActivity 실행 완료")
} catch (e: Exception) {
Log.e(TAG, "AlarmActivity 실행 실패", e)
}
}, 500)
} catch (e: Exception) {
Log.e(TAG, "알람 실행 실패", e)
@@ -108,7 +108,16 @@ object AppUpdateManager {
btnNow.setOnClickListener {
dialog.dismiss()
downloadAndInstallApk(activity, apkUrl, version)
try {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(apkUrl)).apply {
flags = Intent.FLAG_ACTIVITY_NEW_TASK
}
activity.startActivity(intent)
Toast.makeText(activity, "최신 버전 다운로드 페이지로 이동합니다.", Toast.LENGTH_SHORT).show()
} catch (e: Exception) {
e.printStackTrace()
Toast.makeText(activity, "다운로드 링크 열기 실패: ${e.message}", Toast.LENGTH_SHORT).show()
}
}
dialog.show()
@@ -116,100 +125,4 @@ object AppUpdateManager {
val width = (activity.resources.displayMetrics.widthPixels * 0.88).toInt()
dialog.window?.setLayout(width, android.view.ViewGroup.LayoutParams.WRAP_CONTENT)
}
private fun downloadAndInstallApk(activity: Activity, apkUrl: String, version: String) {
if (activity.isFinishing || activity.isDestroyed) return
val view = LayoutInflater.from(activity).inflate(R.layout.dialog_update_progress_oneui, null)
val tvSub = view.findViewById<TextView>(R.id.tvProgressSub)
val progressBar = view.findViewById<ProgressBar>(R.id.downloadProgressBar)
val tvPercent = view.findViewById<TextView>(R.id.tvProgressPercent)
tvSub.text = "v$version 다운로드 중..."
val progressDialog = AlertDialog.Builder(activity)
.setView(view)
.setCancelable(false)
.create()
progressDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
progressDialog.show()
val width = (activity.resources.displayMetrics.widthPixels * 0.88).toInt()
progressDialog.window?.setLayout(width, android.view.ViewGroup.LayoutParams.WRAP_CONTENT)
Thread {
try {
val url = URL(apkUrl)
val connection = url.openConnection() as HttpURLConnection
connection.connectTimeout = 15000
connection.readTimeout = 15000
connection.requestMethod = "GET"
connection.connect()
val fileLength = connection.contentLength
val inputStream = BufferedInputStream(connection.inputStream)
val apkFile = File(activity.cacheDir, "update.apk")
val outputStream = FileOutputStream(apkFile)
val buffer = ByteArray(8192)
var total: Long = 0
var count: Int
while (inputStream.read(buffer).also { count = it } != -1) {
total += count
outputStream.write(buffer, 0, count)
if (fileLength > 0) {
val progress = (total * 100 / fileLength).toInt()
activity.runOnUiThread {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
progressBar.setProgress(progress, true)
} else {
progressBar.progress = progress
}
tvPercent.text = "$progress%"
}
}
}
outputStream.flush()
outputStream.close()
inputStream.close()
connection.disconnect()
activity.runOnUiThread {
progressDialog.dismiss()
installApk(activity, apkFile)
}
} catch (e: Exception) {
e.printStackTrace()
activity.runOnUiThread {
progressDialog.dismiss()
Toast.makeText(activity, "다운로드 실패: ${e.message}", Toast.LENGTH_LONG).show()
}
}
}.start()
}
private fun installApk(activity: Activity, apkFile: File) {
try {
val apkUri = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
FileProvider.getUriForFile(activity, "${activity.packageName}.provider", apkFile)
} else {
Uri.fromFile(apkFile)
}
val intent = Intent(Intent.ACTION_VIEW).apply {
setDataAndType(apkUri, "application/vnd.android.package-archive")
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
}
activity.startActivity(intent)
} catch (e: Exception) {
e.printStackTrace()
Toast.makeText(activity, "설치 실패: ${e.message}", Toast.LENGTH_LONG).show()
}
}
}
@@ -232,7 +232,7 @@ class FragmentSettingsBasic : Fragment() {
val prefs = requireContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
binding.btnBatteryOptimize.setOnClickListener {
AlarmPermissionUtil.requestBatteryOptimization(requireContext())
AlarmPermissionUtil.requestBatteryOptimization(requireActivity())
}
binding.btnExactAlarm.setOnClickListener {
@@ -240,23 +240,23 @@ class FragmentSettingsBasic : Fragment() {
val intent = Intent(Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM).apply {
data = Uri.parse("package:${requireContext().packageName}")
}
startActivity(intent)
requireActivity().startActivity(intent)
}
}
binding.btnOverlayPermission.setOnClickListener {
AlarmPermissionUtil.requestOverlayPermission(requireContext())
AlarmPermissionUtil.requestOverlayPermission(requireActivity())
}
binding.btnFullScreenIntent.setOnClickListener {
AlarmPermissionUtil.requestFullScreenIntentPermission(requireContext())
AlarmPermissionUtil.requestFullScreenIntentPermission(requireActivity())
}
binding.btnPermissionSettings.setOnClickListener {
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
data = Uri.parse("package:${requireContext().packageName}")
}
startActivity(intent)
requireActivity().startActivity(intent)
}
binding.btnCheckUpdate.setOnClickListener {