Merge branch 'develop' into feat/onboarding-#3

TeamDMU · Mar 13, 2024 · e594a56 · e594a56
2 parents 146b04a + 5e93869
commit e594a56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,8 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.YouDongKnowMe">
+        android:theme="@style/Theme.YouDongKnowMe"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".ui.view.permission.OnboardingPermissionActivity"
             android:exported="false" />

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt b/app/src/main/java/com/dongyang/android/youdongknowme/standard/network/RetrofitObject.kt
@@ -13,13 +13,14 @@ object RetrofitObject {
 
     fun getNetwork(): Retrofit {
 
-        val baseUrl = "https://triphub.kr/"
+        val baseUrl = "http://43.200.194.238:8080/"
 
         val baseInterceptor = Interceptor { chain ->
             val request = chain.request().newBuilder()
             val originalHttpUrl = chain.request().url
 
-            val url = originalHttpUrl.newBuilder().addQueryParameter("api_key", BuildConfig.API_KEY).build()
+            val url = originalHttpUrl.newBuilder().addQueryParameter("api_key", BuildConfig.API_KEY)
+                .build()
             request.url(url)
             chain.proceed(request.build())
         }

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">3.38.118.184</domain>
+        <domain includeSubdomains="true">43.200.194.238</domain>
     </domain-config>
 </network-security-config>