From 455a12a4b016c1b4c1ae7b1ad71e898b395429a5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 22:52:19 +0000
Subject: [PATCH 1/6] chore(deps): update gmsgoogleservicesgradleplugin to
 v4.4.1

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b07d0c76..9dee2fc4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -46,7 +46,7 @@ moshi = "1.15.1"
 androidPlayAppUpdateKtx = "2.1.0"
 androidPlayReviewKtx = "2.0.1"
 firebaseCrashlyticsPlugin = "2.9.9"
-gmsGoogleServicesGradlePlugin = "4.4.0"
+gmsGoogleServicesGradlePlugin = "4.4.1"
 firebaseBom = "32.7.1"
 leakcanaryAndroid = "2.13"
 okhttp3Bom = "4.12.0"

From 2c7a35c943021f687fdd6e4bc7b0774f8cc67b40 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:15:28 +0000
Subject: [PATCH 2/6] fix(deps): update dependency
 org.jetbrains.kotlinx:kotlinx-coroutines-bom to v1.8.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b07d0c76..62b7dd73 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -31,7 +31,7 @@ coil = "2.5.0"
 hilt = "2.50"
 hiltExt = "1.1.0"
 kotlin = "1.9.22"
-kotlinxCoroutines = "1.7.3"
+kotlinxCoroutines = "1.8.0"
 kotlinxCollectionsImmutable = "0.3.7"
 androidxProfileInstaller = "1.3.1"
 androidxTestRunner = "1.5.2"

From 8170b45b696c7ba068dc35c194afce258fed06be Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 01:10:22 +0000
Subject: [PATCH 3/6] fix(deps): update protobuf to v3.25.3

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b07d0c76..0939dbdc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ androidxTestRunner = "1.5.2"
 androidxTestCore = "1.5.0"
 androidxBenchmarkMacroJunit4 = "1.2.3"
 androidxTestRules = "1.5.0"
-protobuf = "3.25.2"
+protobuf = "3.25.3"
 protobufPlugin = "0.9.4"
 retrofit = "2.9.0"
 room = "2.6.1"

From 4bd6de9abbab6b95868e78abc97e975bac72126b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:14:19 +0000
Subject: [PATCH 4/6] fix(deps): update dependency
 com.google.firebase:firebase-bom to v32.7.2

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e1c833f5..3026e8b9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -47,7 +47,7 @@ androidPlayAppUpdateKtx = "2.1.0"
 androidPlayReviewKtx = "2.0.1"
 firebaseCrashlyticsPlugin = "2.9.9"
 gmsGoogleServicesGradlePlugin = "4.4.1"
-firebaseBom = "32.7.1"
+firebaseBom = "32.7.2"
 leakcanaryAndroid = "2.13"
 okhttp3Bom = "4.12.0"
 inject = "1"

From 78e385ec1d0b478fe9cccce6a1ece07f5782a100 Mon Sep 17 00:00:00 2001
From: joeloewi7178 <joeloewi7178@gmail.com>
Date: Mon, 19 Feb 2024 23:32:57 +0900
Subject: [PATCH 5/6] del: ssl certificate mod: retry when exception is unknown

---
 .github/workflows/main.yml                    |   3 --
 .github/workflows/on_pull_request.yml         |   3 --
 .../attendances/screen/LoginHoYoLABScreen.kt  |   2 +-
 .../croissant/worker/CheckSessionWorker.kt    |  47 ++++++++++--------
 app/src/main/res/raw/hoyolab_ca.der           | Bin 1945 -> 0 bytes
 .../main/res/xml/network_security_config.xml  |   3 --
 6 files changed, 27 insertions(+), 31 deletions(-)
 delete mode 100644 app/src/main/res/raw/hoyolab_ca.der

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 44182799..17537b68 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,9 +43,6 @@ 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/base64-to-file@v1.2
         with:
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
index 43937398..0a4a9d0e 100644
--- a/.github/workflows/on_pull_request.yml
+++ b/.github/workflows/on_pull_request.yml
@@ -43,9 +43,6 @@ 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/base64-to-file@v1.2
         with:
diff --git a/app/src/main/kotlin/com/joeloewi/croissant/ui/navigation/main/attendances/screen/LoginHoYoLABScreen.kt b/app/src/main/kotlin/com/joeloewi/croissant/ui/navigation/main/attendances/screen/LoginHoYoLABScreen.kt
index 366d294b..1a6398d8 100644
--- a/app/src/main/kotlin/com/joeloewi/croissant/ui/navigation/main/attendances/screen/LoginHoYoLABScreen.kt
+++ b/app/src/main/kotlin/com/joeloewi/croissant/ui/navigation/main/attendances/screen/LoginHoYoLABScreen.kt
@@ -233,7 +233,7 @@ fun LoginHoYoLABContent(
                         is LoadingState.Loading -> {
                             LinearProgressIndicator(
                                 modifier = Modifier.fillMaxWidth(),
-                                progress = progress
+                                progress = { progress }
                             )
                         }
 
diff --git a/app/src/main/kotlin/com/joeloewi/croissant/worker/CheckSessionWorker.kt b/app/src/main/kotlin/com/joeloewi/croissant/worker/CheckSessionWorker.kt
index af44f28c..a9726949 100644
--- a/app/src/main/kotlin/com/joeloewi/croissant/worker/CheckSessionWorker.kt
+++ b/app/src/main/kotlin/com/joeloewi/croissant/worker/CheckSessionWorker.kt
@@ -97,34 +97,39 @@ class CheckSessionWorker @AssistedInject constructor(
                                     createCheckSessionNotification(_attendanceId)
                                 )
                             }
+                        } else {
+                            Firebase.crashlytics.recordException(cause)
                         }
+
+                        val executionLogId = insertWorkerExecutionLogUseCase(
+                            WorkerExecutionLog(
+                                attendanceId = _attendanceId,
+                                state = WorkerExecutionLogState.FAILURE,
+                                loggableWorker = LoggableWorker.CHECK_SESSION
+                            )
+                        )
+
+                        insertFailureLogUseCase(
+                            FailureLog(
+                                executionLogId = executionLogId,
+                                failureMessage = cause.message ?: "",
+                                failureStackTrace = cause.stackTraceToString()
+                            )
+                        )
+
+                        //let chained works do their jobs
+                        Result.success()
                     }
 
                     is CancellationException -> {
                         throw cause
                     }
-                }
-
-                Firebase.crashlytics.recordException(cause)
-
-                val executionLogId = insertWorkerExecutionLogUseCase(
-                    WorkerExecutionLog(
-                        attendanceId = _attendanceId,
-                        state = WorkerExecutionLogState.FAILURE,
-                        loggableWorker = LoggableWorker.CHECK_SESSION
-                    )
-                )
-
-                insertFailureLogUseCase(
-                    FailureLog(
-                        executionLogId = executionLogId,
-                        failureMessage = cause.message ?: "",
-                        failureStackTrace = cause.stackTraceToString()
-                    )
-                )
 
-                //let chained works do their jobs
-                Result.success()
+                    else -> {
+                        Firebase.crashlytics.log("runAttemptCount: $runAttemptCount")
+                        Result.retry()
+                    }
+                }
             }
         )
     }
diff --git a/app/src/main/res/raw/hoyolab_ca.der b/app/src/main/res/raw/hoyolab_ca.der
deleted file mode 100644
index 11b2ba3fec5e305f06dd420a6a4e50f69e0f4a25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1945
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

diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
index 2a1d7a9b..88e5fdb5 100644
--- a/app/src/main/res/xml/network_security_config.xml
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -17,8 +17,5 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">hoyolab.com</domain>
-        <trust-anchors>
-            <certificates src="@raw/hoyolab_ca" />
-        </trust-anchors>
     </domain-config>
 </network-security-config>
\ No newline at end of file

From a7fad72e93d7113e9e5185d1c377a6e094e642ee Mon Sep 17 00:00:00 2001
From: joeloewi7178 <joeloewi7178@gmail.com>
Date: Mon, 19 Feb 2024 23:35:47 +0900
Subject: [PATCH 6/6] versionCode 58 versionName 1.2.8

---
 app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 61d185e8..f03cd0c1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -20,8 +20,8 @@ android {
 
     defaultConfig {
         applicationId = "com.joeloewi.croissant"
-        versionCode = 57
-        versionName = "1.2.7"
+        versionCode = 58
+        versionName = "1.2.8"
         targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"