Development

.github/workflows/main.yml

@@ -43,6 +43,9 @@ jobs:
       - name: Access GOOGLE_SERVICES_JSON
         run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
 
+      - name: Extract ssl certificate from hoyolab.com and replace
+        run: openssl s_client -showcerts -connect www.hoyolab.com:443 </dev/null 2>/dev/null|openssl x509 -outform DER >./app/src/main/res/raw/hoyolab_ca.der
+
       - name: Generate jks file from base64
         uses: timheuer/[email protected]
         with:

.github/workflows/on_pull_request.yml

@@ -43,6 +43,9 @@ jobs:
       - name: Access GOOGLE_SERVICES_JSON
         run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
 
+      - name: Extract ssl certificate from hoyolab.com and replace
+        run: openssl s_client -showcerts -connect www.hoyolab.com:443 </dev/null 2>/dev/null|openssl x509 -outform DER >./app/src/main/res/raw/hoyolab_ca.der
+
       - name: Generate jks file from base64
         uses: timheuer/[email protected]
         with:

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
 
     defaultConfig {
         applicationId = "com.joeloewi.croissant"
-        versionCode = 53
-        versionName = "1.2.4"
+        versionCode = 54
+        versionName = "1.2.5"
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/res/values-en-rUS/strings.xml

@@ -89,7 +89,7 @@
     <string name="not_update_due_to_battery_optimization">Widget will not be updated while battery optimization is enabled for croissant</string>
     <string name="device_rooting_detected">Device rooting dectected. App wiil be closed.</string>
     <string name="change_setting">Change setting</string>
-    <string name="experimental_sns_login_feature">Login via SNS account may occurs some errors. Facebook login is not supported.</string>
+    <string name="experimental_sns_login_feature">Facebook login is not supported.</string>
     <string name="websites">Websites</string>
     <string name="contacts">Contacts</string>
     <string name="email">Email</string>

app/src/main/res/values-ko-rKR/strings.xml

@@ -88,7 +88,7 @@
     <string name="not_update_due_to_battery_optimization">앱이 배터리 최적화 대상으로 설정되어있어 위젯을 업데이트 할 수 없습니다.</string>
     <string name="device_rooting_detected">루팅이 감지되었습니다. 앱을 종료합니다.</string>
     <string name="change_setting">설정 바꾸기</string>
-    <string name="experimental_sns_login_feature">SNS 로그인은 오류가 발생할 수 있으며 페이스북 로그인은 지원되지 않습니다.</string>
+    <string name="experimental_sns_login_feature">페이스북 로그인은 지원되지 않습니다.</string>
     <string name="websites">웹사이트</string>
     <string name="contacts">연락처</string>
     <string name="email">이메일</string>

app/src/main/res/values/strings.xml

@@ -94,7 +94,7 @@
     <string name="not_update_due_to_battery_optimization">Widget will not be updated while battery optimization is enabled for croissant</string>
     <string name="device_rooting_detected">Device rooting dectected. App wiil be closed.</string>
     <string name="change_setting">Change setting</string>
-    <string name="experimental_sns_login_feature">Login via SNS account may occurs some errors. Facebook login is not supported.</string>
+    <string name="experimental_sns_login_feature">Facebook login is not supported.</string>
     <string name="websites">Websites</string>
     <string name="contacts">Contacts</string>
     <string name="email">Email</string>

app/src/main/res/xml/network_security_config.xml

@@ -15,9 +15,10 @@
   -->
 
 <network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
+    <domain-config>
         <domain includeSubdomains="true">hoyolab.com</domain>
-        <domain includeSubdomains="true">arca.live</domain>
-        <domain includeSubdomains="true">cloudfront.net</domain>
+        <trust-anchors>
+            <certificates src="@raw/hoyolab_ca"/>
+        </trust-anchors>
     </domain-config>
 </network-security-config>