From 8cd2fa3b763e84d7c9bd6086d463ecbe6e637fc2 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:58:01 +0200 Subject: [PATCH 1/4] chore: Update dependencies Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com> --- app/build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4f9b24b..4e9a890 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,23 +94,23 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.13.1' implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0') - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.3' implementation 'androidx.activity:activity-compose:1.9.0' implementation 'androidx.activity:activity-ktx:1.9.0' - implementation platform('androidx.compose:compose-bom:2024.05.00') + implementation platform('androidx.compose:compose-bom:2024.06.00') implementation 'androidx.compose.ui:ui' implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3:1.2.1' - implementation "androidx.compose.material:material-icons-extended:1.6.7" + implementation "androidx.compose.material:material-icons-extended:1.6.8" implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.documentfile:documentfile:1.0.1' - implementation 'androidx.lifecycle:lifecycle-service:2.8.1' + implementation 'androidx.lifecycle:lifecycle-service:2.8.3' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - androidTestImplementation platform('androidx.compose:compose-bom:2024.05.00') + androidTestImplementation 'androidx.test.ext:junit:1.2.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation platform('androidx.compose:compose-bom:2024.06.00') androidTestImplementation 'androidx.compose.ui:ui-test-junit4' debugImplementation 'androidx.compose.ui:ui-tooling' debugImplementation 'androidx.compose.ui:ui-test-manifest' @@ -135,7 +135,7 @@ dependencies { implementation 'com.maxkeppeler.sheets-compose-dialogs:list:1.2.0' implementation 'com.maxkeppeler.sheets-compose-dialogs:input:1.2.0' - def camerax_version = "1.3.3" + def camerax_version = "1.3.4" implementation "androidx.camera:camera-core:${camerax_version}" implementation "androidx.camera:camera-camera2:${camerax_version}" implementation "androidx.camera:camera-lifecycle:${camerax_version}" From 73e99afadcdf8951a52d482cb137767018f58397 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:50:21 +0200 Subject: [PATCH 2/4] fix: Properly surround filename in quotation marks Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com> --- .../myzel394/alibi/helpers/BatchesFolder.kt | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt index ba394ef..873ca2c 100644 --- a/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt +++ b/app/src/main/java/app/myzel394/alibi/helpers/BatchesFolder.kt @@ -419,11 +419,25 @@ abstract class BatchesFolder( } } - context.contentResolver.delete( - scopedMediaContentUri, - "${MediaStore.MediaColumns.DISPLAY_NAME} IN (${deletableNames.joinToString(",")})", - null, - ) + try { + context.contentResolver.delete( + scopedMediaContentUri, + "${MediaStore.MediaColumns.DISPLAY_NAME} IN (${ + deletableNames.joinToString( + "," + ) { "'$it'" } + })", + null, + ) + // This is unfortunate if the files can't be deleted, but let's just + // ignore it since we can't do anything about it + } catch (e: RuntimeException) { + // Probably file not found + e.printStackTrace() + } catch (e: IllegalArgumentException) { + // Strange filename, should not happen + e.printStackTrace() + } } else { // TODO: Fix "would you like to try saving" -> Save button legacyMediaFolder.listFiles()?.forEach { From f6de5a4449cce2c1b5e0c8bc601ffe17a9de0efd Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:52:44 +0200 Subject: [PATCH 3/4] chore: Update version Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com> --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4e9a890..9ae6af4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "app.myzel394.alibi" minSdk 24 targetSdk 34 - versionCode 13 - versionName "0.5.0" + versionCode 14 + versionName "0.5.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { From 061ed8b156562354fe54d2a5f0102ad616e4b886 Mon Sep 17 00:00:00 2001 From: Myzel394 <50424412+Myzel394@users.noreply.github.com> Date: Thu, 25 Jul 2024 21:29:38 +0200 Subject: [PATCH 4/4] fix(ci-cd): Add required shell attribute Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com> --- .github/actions/prepare-keystore/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/prepare-keystore/action.yml b/.github/actions/prepare-keystore/action.yml index 2cb0830..d8be61d 100644 --- a/.github/actions/prepare-keystore/action.yml +++ b/.github/actions/prepare-keystore/action.yml @@ -23,6 +23,7 @@ runs: run: echo "${{ inputs.keyStoreBase64 }}" | base64 -d > /home/runner/key.jks - name: Write Keystore properties 🗝️ + shell: bash run: | echo "storeFile=/home/runner/key.jks" > key.properties echo "storePassword=${{ inputs.signingStorePassword }}" >> key.properties