v0.3.4: update proguard-rules.pro

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
  applicationId = "com.hotdeal.alarm"
  minSdk = 31
  targetSdk = 35
-        versionCode = 33
-        versionName = "0.3.3"
+        versionCode = 34
+        versionName = "0.3.4"
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
  vectorDrawables {

app/proguard-rules.pro

@@ -1,8 +1,40 @@
 # Add project specific ProGuard rules here.
 -keepattributes Signature
 -keepattributes *Annotation*
+
+# Data Entities & Models
 -keep class com.hotdeal.alarm.data.local.db.entity.** { *; }
 -keep class com.hotdeal.alarm.domain.model.** { *; }
+-keep class com.hotdeal.alarm.data.local.preferences.** { *; }
+
+# Room Database & DAOs
+-keep class * extends androidx.room.RoomDatabase
+-keep class com.hotdeal.alarm.data.local.db.dao.** { *; }
+-dontwarn androidx.room.paging.**
+
+# WorkManager & Hilt Worker
+-keep class androidx.work.** { *; }
+-keep class androidx.hilt.work.** { *; }
+-keep class com.hotdeal.alarm.worker.** { *; }
+-keep class * extends androidx.work.ListenableWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.Worker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+-keep class * extends androidx.work.CoroutineWorker {
+    public <init>(android.content.Context, androidx.work.WorkerParameters);
+}
+
+# Dagger & Hilt
+-keep class com.hotdeal.alarm.di.** { *; }
+-keep class * extends android.app.Application
+-keep class * extends android.app.Service
+-keep class * extends android.content.BroadcastReceiver
+-keep class com.hotdeal.alarm.receiver.** { *; }
+
+# Scrapers & Remote Data
+-keep class com.hotdeal.alarm.data.remote.scraper.** { *; }
 
 # OkHttp
 -dontwarn okhttp3.**
@@ -19,4 +51,3 @@
 
 # JSpecify annotations (for Jsoup compatibility)
 -dontwarn org.jspecify.annotations.**
-

app/src/main/AndroidManifest.xml

@@ -14,8 +14,9 @@
     <!-- Notifications (Android 13+) -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!-- Exact Alarms (Android 12+) -->
+    <!-- Exact Alarms (Android 12+, Android 13+) -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
 
     <!-- Boot Completed -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -36,17 +37,17 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="35">
 
- <!-- Disable default WorkManager initializer to use HiltWorkerFactory -->
- <provider
- android:name="androidx.startup.InitializationProvider"
- android:authorities="${applicationId}.androidx-startup"
- android:exported="false"
- tools:node="merge">
- <meta-data
- android:name="androidx.work.WorkManagerInitializer"
- android:value="androidx.startup"
- tools:node="remove" />
- </provider>
+        <!-- Disable default WorkManager initializer to use HiltWorkerFactory -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
 
         <activity
             android:name=".presentation.main.MainActivity"
@@ -65,37 +66,50 @@
             android:exported="false"
             android:foregroundServiceType="dataSync" />
 
-    <!-- Boot Receiver: 부팅/앱 업데이트 후 백그라운드 폴링 자동 재등록 -->
-    <receiver
-        android:name=".receiver.BootReceiver"
-        android:enabled="true"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-            <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-        </intent-filter>
-    </receiver>
-    <receiver
-        android:name=".widget.HotDealWidget"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-        </intent-filter>
-        <meta-data
-            android:name="android.appwidget.provider"
-            android:resource="@xml/widget_info" />
-    </receiver>
+        <!-- Polling Alarm Receiver: 정확한 주기 알람 수신 및 핫딜 스크래핑 트리거 -->
+        <receiver
+            android:name=".receiver.PollingAlarmReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.hotdeal.alarm.ACTION_POLL_ALARM" />
+            </intent-filter>
+        </receiver>
 
-    <!-- FileProvider for APK installation -->
-    <provider
-        android:name="androidx.core.content.FileProvider"
-        android:authorities="${applicationId}.fileprovider"
-        android:exported="false"
-        android:grantUriPermissions="true">
-        <meta-data
-            android:name="android.support.FILE_PROVIDER_PATHS"
-            android:resource="@xml/file_paths" />
-    </provider>
-</application>
+        <!-- Boot Receiver: 부팅/앱 업데이트 후 백그라운드 폴링 자동 재등록 -->
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Widget Receiver -->
+        <receiver
+            android:name=".widget.HotDealWidget"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/widget_info" />
+        </receiver>
+
+        <!-- FileProvider for APK installation -->
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileprovider"
+            android:exported="false"
+            tools:replace="android:authorities"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 
 </manifest>

app/src/main/java/com/hotdeal/alarm/data/remote/scraper/PpomppuScraper.kt

@@ -3,6 +3,7 @@ package com.hotdeal.alarm.data.remote.scraper
 import android.util.Log
 import com.hotdeal.alarm.domain.model.HotDeal
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -13,7 +14,7 @@ import kotlin.random.Random
 
 /**
  * 뽐뿌 스크래퍼
- * - hotlist_flag=999 페이지에서 인기글 ID를 수집하여 HOT 뱃지 표시
+ * - hotlist_flag=999 페이지와 일반 게시판을 병렬 스크래핑하여 HOT 뱃지 신속 감지
  * - 기존 hotpop_bg_color CSS 클래스도 폴백으로 감지
  */
 class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
@@ -27,15 +28,13 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
     
     override suspend fun scrape(board: String): Result<List<HotDeal>> = withContext(Dispatchers.IO) {
         try {
-            // 1단계: 인기글(hotlist) 페이지에서 인기 게시물 ID 목록 수집
-            val hotPostIds = fetchHotPostIds(board)
-            Log.d("Ppomppu", "인기글 ID ${hotPostIds.size}개 수집됨: $hotPostIds")
-
-            // 2단계: 일반 게시판 페이지 스크래핑
             val url = getBoardUrl(board)
             Log.d("Ppomppu", "스크래핑 시작: $url")
+
+            // 1. 인기글 목록과 일반 게시판을 병렬(async)로 동시에 요청하여 딜레이 최소화
+            val hotPostIdsDeferred = async { fetchHotPostIds(board) }
             
-            val delayTime = Random.nextLong(2000, 4000)
+            val delayTime = Random.nextLong(500, 1500)
             delay(delayTime)
             
             val userAgent = getRandomUserAgent()
@@ -45,9 +44,12 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
                 .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
                 .header("Accept-Charset", "utf-8,ISO-8859-1")
                 .header("Referer", "https://www.ppomppu.co.kr/")
-                .timeout(30000)
+                .timeout(12000)
                 .followRedirects(true)
                 .get()
+
+            val hotPostIds = hotPostIdsDeferred.await()
+            Log.d("Ppomppu", "인기글 ID ${hotPostIds.size}개 수집됨: $hotPostIds")
             
             val deals = mutableListOf<HotDeal>()
             val rowElements: Elements = doc.select("tr.baseList")
@@ -55,7 +57,7 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
 
             var count = 0
             rowElements.forEach { row ->
-                if (count >= 20) return@forEach
+                if (count >= 25) return@forEach
 
                 try {
                     val titleElement = row.selectFirst("a.baseList-title") ?: return@forEach
@@ -108,14 +110,12 @@ class PpomppuScraper(client: OkHttpClient) : BaseScraper(client) {
             val hotUrl = "${baseUrl}zboard.php?id=$board&hotlist_flag=999"
             Log.d("Ppomppu", "인기글 페이지 조회: $hotUrl")
 
-            delay(Random.nextLong(1000, 2000))
-
             val doc = Jsoup.connect(hotUrl)
                 .userAgent(getRandomUserAgent())
                 .header("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8")
                 .header("Accept-Language", "ko-KR,ko;q=0.9,en-US;q=0.8,en;q=0.7")
                 .header("Referer", "https://www.ppomppu.co.kr/")
-                .timeout(15000)
+                .timeout(8000)
                 .followRedirects(true)
                 .get()
 

app/src/main/java/com/hotdeal/alarm/presentation/main/MainViewModel.kt

@@ -70,7 +70,7 @@ class MainViewModel @Inject constructor(
                     siteName = site.name,
                     boardName = board.id,
                     displayName = "${site.displayName} - ${board.displayName}",
-                    isEnabled = false
+                    isEnabled = true // 기본값: 활성화 (설치 즉시 수집 작동)
                 )
             }
         }

app/src/main/java/com/hotdeal/alarm/receiver/PollingAlarmReceiver.kt

@@ -0,0 +1,59 @@
+package com.hotdeal.alarm.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.util.Log
+import com.hotdeal.alarm.data.local.preferences.AppSettings
+import com.hotdeal.alarm.worker.AlarmScheduler
+import com.hotdeal.alarm.worker.WorkerScheduler
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * 주기적 알람 수신 시 백그라운드 스크래핑을 실행하고 다음 알람을 예약하는 리시버
+ */
+@AndroidEntryPoint
+class PollingAlarmReceiver : BroadcastReceiver() {
+
+    companion object {
+        private const val TAG = "PollingAlarmReceiver"
+    }
+
+    @Inject
+    lateinit var workerScheduler: WorkerScheduler
+
+    @Inject
+    lateinit var alarmScheduler: AlarmScheduler
+
+    @Inject
+    lateinit var appSettings: AppSettings
+
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == AlarmScheduler.ACTION_POLL_ALARM) {
+            Log.d(TAG, "⏰ 폴링 알람 수신 -> 핫딜 스크래핑 1회 즉시 실행 및 다음 알람 예약")
+            
+            // 1. 핫딜 스크래핑 실행
+            workerScheduler.executeOnce()
+
+            // 2. 다음 주기 알람 예약 (Self-rescheduling)
+            scope.launch {
+                try {
+                    val interval = appSettings.pollingInterval.first().toLong()
+                    alarmScheduler.scheduleAlarm(interval)
+                    Log.d(TAG, "다음 폴링 알람 예약 완료: ${interval}분 후")
+                } catch (e: Exception) {
+                    Log.e(TAG, "다음 알람 예약 실패: ${e.message}")
+                    alarmScheduler.scheduleAlarm(WorkerScheduler.DEFAULT_INTERVAL_MINUTES)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/worker/AlarmScheduler.kt

@@ -0,0 +1,116 @@
+package com.hotdeal.alarm.worker
+
+import android.app.AlarmManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.util.Log
+import com.hotdeal.alarm.receiver.PollingAlarmReceiver
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * 실시간 백그라운드 폴링을 위한 AlarmManager 스케줄러
+ * 
+ * WorkManager PeriodicWork의 15분 주기 제한 및 Doze 모드 지연을 극복하기 위해
+ * AlarmManager (setExactAndAllowWhileIdle / setAndAllowWhileIdle)를 사용하여
+ * 사용자가 설정한 주기(1분, 2분, 5분 등)대로 정확하게 백그라운드 수집을 보장합니다.
+ */
+@Singleton
+class AlarmScheduler @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    companion object {
+        private const val TAG = "AlarmScheduler"
+        const val ACTION_POLL_ALARM = "com.hotdeal.alarm.ACTION_POLL_ALARM"
+        private const val REQUEST_CODE = 2001
+    }
+
+    private val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+
+    /**
+     * 알람 예약 (Doze mode에서도 정확히 깨어남)
+     * @param intervalMinutes 폴링 간격 (분)
+     */
+    fun scheduleAlarm(intervalMinutes: Long) {
+        val safeInterval = intervalMinutes.coerceAtLeast(1L)
+        val triggerTime = System.currentTimeMillis() + (safeInterval * 60 * 1000L)
+
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                if (alarmManager.canScheduleExactAlarms()) {
+                    alarmManager.setExactAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Exact Alarm 예약 완료: ${safeInterval}분 후 (${triggerTime})")
+                } else {
+                    alarmManager.setAndAllowWhileIdle(
+                        AlarmManager.RTC_WAKEUP,
+                        triggerTime,
+                        pendingIntent
+                    )
+                    Log.d(TAG, "Inexact Alarm 예약 완료: ${safeInterval}분 후 (권한 없음)")
+                }
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                alarmManager.setExactAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+                Log.d(TAG, "Exact Alarm 예약 완료 (API < 31): ${safeInterval}분 후")
+            } else {
+                alarmManager.setExact(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, "Alarm 예약 실패: ${e.message}", e)
+            try {
+                alarmManager.setAndAllowWhileIdle(
+                    AlarmManager.RTC_WAKEUP,
+                    triggerTime,
+                    pendingIntent
+                )
+            } catch (fallbackEx: Exception) {
+                Log.e(TAG, "Alarm 폴백 예약도 실패: ${fallbackEx.message}")
+            }
+        }
+    }
+
+    /**
+     * 알람 취소
+     */
+    fun cancelAlarm() {
+        val intent = Intent(context, PollingAlarmReceiver::class.java).apply {
+            action = ACTION_POLL_ALARM
+        }
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            REQUEST_CODE,
+            intent,
+            PendingIntent.FLAG_NO_CREATE or PendingIntent.FLAG_IMMUTABLE
+        )
+
+        if (pendingIntent != null) {
+            alarmManager.cancel(pendingIntent)
+            pendingIntent.cancel()
+            Log.d(TAG, "Alarm 취소 완료")
+        }
+    }
+}

app/src/main/java/com/hotdeal/alarm/worker/WorkerScheduler.kt

@@ -1,6 +1,7 @@
 package com.hotdeal.alarm.worker
 
 import android.content.Context
+import android.util.Log
 import androidx.work.*
 import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.concurrent.TimeUnit
@@ -8,35 +9,40 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 /**
- * Worker 스케줄러
+ * 실시간 백그라운드 폴링 통합 스케줄러
  * 
- * 기본 폴� 주기: 2분
- * 배터리/데이터 절약을 위해 최소 2분 권장
+ * 1. AlarmManager (AlarmScheduler): Doze Mode에서도 사용자가 지정한 정확한 주기(1분, 2분 등)로 즉시 실행
+ * 2. WorkManager (HotDealPollingWorker): OS 백그라운드 작업 관리 및 백업 실행
  */
 @Singleton
 class WorkerScheduler @Inject constructor(
-    @ApplicationContext private val context: Context
+    @ApplicationContext private val context: Context,
+    private val alarmScheduler: AlarmScheduler
 ) {
     companion object {
+        private const val TAG = "WorkerScheduler"
         const val DEFAULT_INTERVAL_MINUTES = 2L
         const val MIN_INTERVAL_MINUTES = 1L
         const val MAX_INTERVAL_MINUTES = 60L
     }
     
     /**
-     * 주기적 폴� 예약
-     * @param intervalMinutes 폴� 간격 (분) - 기본 2분
+     * 주기적 폴링 예약 (AlarmManager + WorkManager 이중 등록)
+     * @param intervalMinutes 폴링 간격 (분)
      */
     fun schedulePeriodicPolling(intervalMinutes: Long = DEFAULT_INTERVAL_MINUTES) {
-        // 최소/최대 값 제한
         val safeInterval = intervalMinutes.coerceIn(MIN_INTERVAL_MINUTES, MAX_INTERVAL_MINUTES)
+        Log.d(TAG, "주기적 폴링 예약 시작: ${safeInterval}분 간격")
+
+        // 1. AlarmManager 기반 정확한 주기 알람 예약 (Doze mode 관통)
+        alarmScheduler.scheduleAlarm(safeInterval)
         
+        // 2. WorkManager 기반 백업 주기 작업 예약
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .setRequiresDeviceIdle(false)
             .build()
         
-        // 유연한 실행 시간 (±25%)
         val flexTime = (safeInterval * 0.25).toLong().coerceAtLeast(1)
         
         val workRequest = PeriodicWorkRequestBuilder<HotDealPollingWorker>(
@@ -60,15 +66,17 @@ class WorkerScheduler @Inject constructor(
     }
     
     /**
-     * 한 번만 실행
+     * 즉시 1회 실행 (메인화면 진입 / 새로고침 / 알람 수신 시)
      */
     fun executeOnce() {
+        Log.d(TAG, "즉시 1회 스크래핑 요청 (executeOnce)")
         val constraints = Constraints.Builder()
             .setRequiredNetworkType(NetworkType.CONNECTED)
             .build()
         
         val workRequest = OneTimeWorkRequestBuilder<HotDealPollingWorker>()
             .setConstraints(constraints)
+            .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
             .addTag(HotDealPollingWorker.TAG)
             .build()
         
@@ -76,22 +84,28 @@ class WorkerScheduler @Inject constructor(
     }
     
     /**
-     * 폴� 취소
+     * 폴링 취소
      */
     fun cancelPolling() {
+        Log.d(TAG, "폴링 전체 취소")
+        alarmScheduler.cancelAlarm()
         WorkManager.getInstance(context).cancelUniqueWork(HotDealPollingWorker.WORK_NAME)
     }
     
     /**
-     * 폴� 활성화 여부 확인
+     * 폴링 활성화 여부 확인
      */
     fun isPollingActive(): Boolean {
-        val workInfos = WorkManager.getInstance(context)
-            .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
-            .get()
-        
-        return workInfos.any { 
-            it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
+        return try {
+            val workInfos = WorkManager.getInstance(context)
+                .getWorkInfosForUniqueWork(HotDealPollingWorker.WORK_NAME)
+                .get()
+            
+            workInfos.any { 
+                it.state == WorkInfo.State.RUNNING || it.state == WorkInfo.State.ENQUEUED 
+            }
+        } catch (e: Exception) {
+            false
         }
     }
 }

version.json

@@ -1,7 +1,7 @@
 {
-  "version": "0.3.3",
-  "versionCode": 33,
-  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.3/app-release.apk",
+  "version": "0.3.4",
+  "versionCode": 34,
+  "updateUrl": "https://git.webpluss.net/sanjeok77/hotdeal_alarm/releases/download/v0.3.4/app-release.apk",
   "changelog": [
     "사이트 및 키워드 순서 조절을 터치 드래그 앤 드롭(Drag & Drop) 방식으로 전면 업그레이드",
     "앱 내 업데이트 시 다운로드 완료 후 설치 화면으로 안 넘어가는 버그 수정",