From 4349f2bd3a88b2fb41576a4e9ae641fb57661f43 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Wed, 21 Aug 2024 12:44:51 +0900
Subject: [PATCH] =?UTF-8?q?targetSdk=2034=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=EC=95=A1=EC=85=98=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A5=BC=20=EB=AA=85?=
 =?UTF-8?q?=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 20 +++++++++----------
 app/proguard-rules.pro                        | 13 ++++++------
 app/src/main/AndroidManifest.xml              |  2 ++
 .../audio_content/AudioContentPlayService.kt  | 11 ++++++++++
 build.gradle                                  |  4 ++--
 gradle.properties                             |  1 +
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f66268c..26d2972 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ plugins {
 
 android {
     namespace 'kr.co.vividnext.sodalive'
-    compileSdk 33
+    compileSdk 34
 
     viewBinding {
         enabled true
@@ -24,11 +24,6 @@ android {
         dataBinding true
     }
 
-    lintOptions {
-        checkDependencies true
-        checkReleaseBuilds false
-    }
-
     dependenciesInfo {
         // Disables dependency metadata when building APKs.
         includeInApk = false
@@ -39,9 +34,9 @@ android {
     defaultConfig {
         applicationId "kr.co.vividnext.sodalive"
         minSdk 23
-        targetSdk 33
-        versionCode 97
-        versionName "1.15.2"
+        targetSdk 34
+        versionCode 98
+        versionName "1.15.3"
     }
 
     buildTypes {
@@ -57,7 +52,8 @@ android {
         }
 
         debug {
-            minifyEnabled false
+            minifyEnabled true
+            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             applicationIdSuffix '.debug'
 
@@ -75,6 +71,10 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
+    lint {
+        checkDependencies true
+        checkReleaseBuilds false
+    }
 }
 
 dependencies {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 4cadbac..ad1db1a 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -222,9 +222,10 @@
 
 -keep class kr.co.bootpay.core.** { *; }
 
--keep class kr.co.pointclick.sdk.offerwall.core.consts.** {*;}
--keep interface kr.co.pointclick.sdk.offerwall.core.consts.** {*;}
--keep class kr.co.pointclick.sdk.offerwall.core.models.** {*;}
--keep interface kr.co.pointclick.sdk.offerwall.core.models.** {*;}
--keep class kr.co.pointclick.sdk.offerwall.core.PointClickAd {*;}
--keep class kr.co.pointclick.sdk.offerwall.core.events.PackageReceiver {*;}
+-keep class retrofit2.** { *; }
+
+-keep class com.google.gson.** { *; }
+-keep class sun.misc.** { *; }
+
+# @Keep 애노테이션이 붙은 클래스, 메서드, 필드를 보호
+-keep @androidx.annotation.Keep class * { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af00269..7b972ef 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
index 68287fe..327bc65 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/AudioContentPlayService.kt
@@ -52,6 +52,7 @@ class AudioContentPlayService :
                 putExtra(Constants.EXTRA_AUDIO_CONTENT_PROGRESS, mediaPlayer.currentPosition)
                 putExtra(Constants.EXTRA_AUDIO_CONTENT_ID, contentId)
             }
+            intent.setPackage(packageName)
             sendBroadcast(intent)
             handler.postDelayed(this, 1000)
         }
@@ -65,6 +66,7 @@ class AudioContentPlayService :
                     sendBroadcast(
                         Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                             .apply {
+                                setPackage(packageName)
                                 putExtra(
                                     Constants.EXTRA_AUDIO_CONTENT_CHANGE_UI,
                                     true
@@ -102,6 +104,7 @@ class AudioContentPlayService :
                     sendBroadcast(
                         Intent(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER)
                             .apply {
+                                setPackage(packageName)
                                 putExtra(
                                     Constants.EXTRA_AUDIO_CONTENT_SHOWING,
                                     true
@@ -137,6 +140,7 @@ class AudioContentPlayService :
                     sendBroadcast(
                         Intent(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER)
                             .apply {
+                                setPackage(packageName)
                                 putExtra(
                                     Constants.EXTRA_AUDIO_CONTENT_SHOWING,
                                     false
@@ -206,6 +210,7 @@ class AudioContentPlayService :
                         sendBroadcast(
                             Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                                 .apply {
+                                    setPackage(packageName)
                                     putExtra(
                                         Constants.EXTRA_AUDIO_CONTENT_NEXT_ACTION,
                                         MusicAction.PAUSE
@@ -221,6 +226,7 @@ class AudioContentPlayService :
                         sendBroadcast(
                             Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                                 .apply {
+                                    setPackage(packageName)
                                     putExtra(
                                         Constants.EXTRA_AUDIO_CONTENT_NEXT_ACTION,
                                         MusicAction.PLAY
@@ -255,6 +261,7 @@ class AudioContentPlayService :
                         sendBroadcast(
                             Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                                 .apply {
+                                    setPackage(packageName)
                                     putExtra(
                                         Constants.EXTRA_AUDIO_CONTENT_LOADING,
                                         true
@@ -318,6 +325,7 @@ class AudioContentPlayService :
         sendBroadcast(
             Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                 .apply {
+                    setPackage(packageName)
                     putExtra(
                         Constants.EXTRA_AUDIO_CONTENT_CHANGE_UI,
                         true
@@ -342,6 +350,7 @@ class AudioContentPlayService :
         sendBroadcast(
             Intent(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER)
                 .apply {
+                    setPackage(packageName)
                     putExtra(
                         Constants.EXTRA_AUDIO_CONTENT_PLAYING,
                         this@AudioContentPlayService.isPlaying
@@ -380,6 +389,7 @@ class AudioContentPlayService :
             sendBroadcast(
                 Intent(Constants.ACTION_AUDIO_CONTENT_RECEIVER)
                     .apply {
+                        setPackage(packageName)
                         putExtra(
                             Constants.EXTRA_AUDIO_CONTENT_NEXT_ACTION,
                             MusicAction.PLAY
@@ -405,6 +415,7 @@ class AudioContentPlayService :
             sendBroadcast(
                 Intent(Constants.ACTION_MAIN_AUDIO_CONTENT_RECEIVER)
                     .apply {
+                        setPackage(packageName)
                         putExtra(
                             Constants.EXTRA_AUDIO_CONTENT_PLAYING,
                             false
diff --git a/build.gradle b/build.gradle
index 5d7c247..94207a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.library' version '8.1.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
 
     id "org.jlleitschuh.gradle.ktlint" version "11.2.0"
diff --git a/gradle.properties b/gradle.properties
index 0854565..00ecaf1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,3 +24,4 @@ org.gradle.configuration-cache=true
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false