[FIX/#10] lint non-null 문제 해결을 위한 코드 재작성

Keyneez · Jul 10, 2023 · 154b8ce · 154b8ce
1 parent e023c3b
commit 154b8ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,11 +7,6 @@ plugins {
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
 }
 
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-
-def kakaoApiKey = properties.getProperty('kakao_api_key')
-
 android {
     namespace 'com.release.keyneez'
     compileSdk 33
@@ -25,12 +20,16 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
         buildConfigField "String", "BASE_URL", properties['base_url']
-        buildConfigField "String", "KAKAO_NATIVE_KEY", kakaoApiKey
+        buildConfigField "String", "KAKAO_NATIVE_KEY", "\"${properties.getProperty("kakao_api_key")}\""
+        buildConfigField "String", "kakao_oauth_host", "\"${properties.getProperty("kakao_oauth_host")}\""
+
+        defaultConfig {
+            manifestPlaceholders = ["kakao_oauth_host": "\"${properties.getProperty("kakao_oauth_host")}\""]
+        }
 
-        manifestPlaceholders = [
-                kakaoApiKey: kakaoApiKey
-        ]
     }
 
     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,8 +7,8 @@
     <application
         android:name=".KeyneezApplication"
         android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -23,11 +23,13 @@
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="oauth"
-                    android:scheme="kakao${kakaoApiKey}" />
+                    android:scheme="${kakao_oauth_host}" />
             </intent-filter>
         </activity>
         <activity