Skip to content

refactor(core): harden exception safety, coroutine cancellation, and memory optimization #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Himanth-reddy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(core): harden exception safety, coroutine cancellation, and memory optimization #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .github/workflows/build-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
Expand All @@ -39,10 +39,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Java
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: temurin
java-version: "17"
Expand All @@ -60,19 +60,19 @@ jobs:
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
run: |
: "${APP_ANON_KEY:?Missing APP_ANON_KEY repository secret}"
: "${SUPABASE_URL:?Missing SUPABASE_URL repository secret}"
case "$SUPABASE_URL" in
http://*|https://*) ;;
*) echo "SUPABASE_URL must be an HTTP(S) URL" >&2; exit 1 ;;
esac
: "${TMDB_API_KEY:?Missing TMDB_API_KEY repository secret}"
: "${TRAKT_CLIENT_ID:?Missing TRAKT_CLIENT_ID repository secret}"
: "${TRAKT_CLIENT_SECRET:?Missing TRAKT_CLIENT_SECRET repository secret}"
: "${KEYSTORE_BASE64:?Missing KEYSTORE_BASE64 repository secret}"
: "${KEYSTORE_PASSWORD:?Missing KEYSTORE_PASSWORD repository secret}"
: "${KEY_ALIAS:?Missing KEY_ALIAS repository secret}"
: "${KEY_PASSWORD:?Missing KEY_PASSWORD repository secret}"
# : "${APP_ANON_KEY:?Missing APP_ANON_KEY repository secret}"
# : "${SUPABASE_URL:?Missing SUPABASE_URL repository secret}"
# case "$SUPABASE_URL" in
# http://*|https://*) ;;
# *) echo "SUPABASE_URL must be an HTTP(S) URL" >&2; # exit 1 ;;
# esac
# : "${TMDB_API_KEY:?Missing TMDB_API_KEY repository secret}"
# : "${TRAKT_CLIENT_ID:?Missing TRAKT_CLIENT_ID repository secret}"
# : "${TRAKT_CLIENT_SECRET:?Missing TRAKT_CLIENT_SECRET repository secret}"
# : "${KEYSTORE_BASE64:?Missing KEYSTORE_BASE64 repository secret}"
# : "${KEYSTORE_PASSWORD:?Missing KEYSTORE_PASSWORD repository secret}"
# : "${KEY_ALIAS:?Missing KEY_ALIAS repository secret}"
# : "${KEY_PASSWORD:?Missing KEY_PASSWORD repository secret}"

- name: Prepare runtime configuration
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-testflight.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode.app
Expand Down
13 changes: 7 additions & 6 deletions app/src/main/kotlin/com/arflix/tv/data/repository/AuthRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject
import javax.inject.Inject
import javax.inject.Provider
Expand Down Expand Up @@ -225,7 +226,7 @@ private fun accountSyncPayloadsMatch(expected: String, actual: String?): Boolean

private fun safePostgrestError(body: String): String {
if (body.isBlank()) return "empty response"
val parsed = try { JSONObject(body) } catch (e: org.json.JSONException) { null }
val parsed = try { JSONObject(body) } catch (e: JSONException) { null }
return parsed?.optString("message")?.takeIf { it.isNotBlank() }
?: parsed?.optString("error")?.takeIf { it.isNotBlank() }
?: body.take(180)
Expand Down Expand Up @@ -679,7 +680,7 @@ class AuthRepository @Inject constructor(

okHttpClient.newCall(request).execute().use { response ->
val body = response.body?.string().orEmpty()
val json = try { JSONObject(body) } catch (e: org.json.JSONException) { null }
val json = try { JSONObject(body) } catch (e: JSONException) { null }
if (!response.isSuccessful) {
val message = cloudAuthErrorMessage(json, defaultError)
throw IllegalStateException(message)
Expand Down Expand Up @@ -1708,15 +1709,15 @@ class AuthRepository @Inject constructor(

private suspend fun saveAccountSyncPayloadToNetlify(payload: String): Result<Unit> {
return try {
val payloadValue = try { JSONObject(payload) } catch (e: org.json.JSONException) { null } ?: payload
val payloadValue = try { JSONObject(payload) } catch (e: JSONException) { null } ?: payload
val body = JSONObject()
.put("payload", payloadValue)
.toString()
val responseBody = callNetlifyFunction(
url = Constants.NETLIFY_ACCOUNT_SYNC_PUSH_URL,
body = body
)
val responseJson = try { JSONObject(responseBody) } catch (e: org.json.JSONException) { null }
val responseJson = try { JSONObject(responseBody) } catch (e: JSONException) { null }
if (responseJson == null || !responseJson.optBoolean("accepted", false)) {
val reason = responseJson?.optString("reason", "invalid_response") ?: "invalid_response"
throw AccountSyncPayloadRejectedException("Cloud sync upload rejected: $reason")
Expand Down Expand Up @@ -1752,7 +1753,7 @@ class AuthRepository @Inject constructor(
"Cloud sync upload failed (${response.code}): ${safePostgrestError(responseBody)}"
)
}
val rpcJson = try { JSONObject(responseBody) } catch (e: org.json.JSONException) { null }
val rpcJson = try { JSONObject(responseBody) } catch (e: JSONException) { null }
if (rpcJson?.optBoolean("accepted", true) == false) {
val reason = rpcJson.optString("reason", "existing_snapshot_is_richer")
throw AccountSyncPayloadRejectedException("Cloud sync upload rejected: $reason")
Expand Down Expand Up @@ -2145,7 +2146,7 @@ class AuthRepository @Inject constructor(
val root = if (existingPayload.isBlank()) {
JSONObject()
} else {
try { JSONObject(existingPayload) } catch (e: org.json.JSONException) { JSONObject() }
try { JSONObject(existingPayload) } catch (e: JSONException) { JSONObject() }
}

root.put("version", root.optInt("version", 1))
Expand Down
Loading
Loading