diff --git a/.github/workflows/preview-apk.yml b/.github/workflows/preview-apk.yml index 316624ae7..15caaf2d0 100644 --- a/.github/workflows/preview-apk.yml +++ b/.github/workflows/preview-apk.yml @@ -51,7 +51,7 @@ jobs: run: ./gradlew --no-daemon -PABI_FILTER=armeabi-v7a assembleFossDebug - name: Upload APK - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: app-preview.apk path: 'build/outputs/apk/foss/debug/*.apk' diff --git a/scripts/upload-beta.sh b/scripts/upload-beta.sh index 71e274b6a..74bf8d5ea 100755 --- a/scripts/upload-beta.sh +++ b/scripts/upload-beta.sh @@ -30,7 +30,6 @@ echo "" echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:" echo "- 🍋 https://download.delta.chat/android/beta/deltachat-gplay-release-$VERSION.apk (google play candidate, overwrites existing installs, should keep data)" echo "- 🍉 https://download.delta.chat/android/beta/deltachat-foss-debug-$VERSION.apk (f-droid candidate, can be installed beside google play)" -echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)" echo "" echo "what to test: PLEASE_FILL_OUT" diff --git a/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java b/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java index 5481ca8f2..341559663 100644 --- a/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java +++ b/src/main/java/org/thoughtcrime/securesms/service/FetchForegroundService.java @@ -49,14 +49,14 @@ public final class FetchForegroundService extends Service { // The background fetch was successful, but we need to wait until all events were processed. // After all events were processed, we will get DC_EVENT_ACCOUNTS_BACKGROUND_FETCH_DONE, // and stop() will be called. - while (fetchingSynchronously) { - try { - // The `wait()` needs to be enclosed in a while loop because there may be - // "spurious wake-ups", i.e. `wait()` may return even though `notifyAll()` wasn't called. - synchronized (STOP_NOTIFIER) { + synchronized (STOP_NOTIFIER) { + while (fetchingSynchronously) { + try { + // The `wait()` needs to be enclosed in a while loop because there may be + // "spurious wake-ups", i.e. `wait()` may return even though `notifyAll()` wasn't called. STOP_NOTIFIER.wait(); - } - } catch (InterruptedException ex) { } + } catch (InterruptedException ex) {} + } } } }