diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6721cf38..241cfb6e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
* Send .webm videos as file, they are not supported by all platforms
* Tweak advanced section and wording of some advanced options
* Fix: avoid crash in push notifications handling
+* Fix: avoid freezing in background
* Fix: clean up web storage of deleted in-chat apps
* Fix: avoid crash when exporting some files with wrong image MIME type
* Expose new "Multi-device mode" option instead of "Delete from server" for chatmail profiles
diff --git a/src/foss/AndroidManifest.xml b/src/foss/AndroidManifest.xml
new file mode 100644
index 000000000..498c668a4
--- /dev/null
+++ b/src/foss/AndroidManifest.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/gplay/AndroidManifest.xml b/src/gplay/AndroidManifest.xml
index 22bb5c9ac..b0d786db4 100644
--- a/src/gplay/AndroidManifest.xml
+++ b/src/gplay/AndroidManifest.xml
@@ -10,6 +10,11 @@
+
+
-
-
diff --git a/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java b/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
index c6929ce95..5df275592 100644
--- a/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
+++ b/src/main/java/org/thoughtcrime/securesms/connect/KeepAliveService.java
@@ -77,11 +77,17 @@ public class KeepAliveService extends Service {
return null;
}
+ @Override
public void onDestroy() {
Log.i("DeltaChat", "*** KeepAliveService.onDestroy()");
// the service will be restarted due to START_STICKY automatically, there's nothing more to do.
}
+ @Override
+ public void onTimeout(int startId, int fgsType) {
+ stopSelf();
+ }
+
static public KeepAliveService getInstance()
{
return s_this; // may be null