Reload on killed

6 years ago · 0eecf0bede
parent 5f872c51fd
commit 0eecf0bede
1 changed files with 12 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@ -1109,7 +1109,12 @@ public class ServiceSynchronize extends LifecycleService {
                    } finally {
                        // Cleanup
                        am.cancel(pi);
-                        unregisterReceiver(alarm);
+                        try {
+                            unregisterReceiver(alarm);
+                        } catch (IllegalArgumentException ex) {
+                            Log.w(new IllegalStateException("Killed", ex));
+                            reload(ServiceSynchronize.this, "killed");
+                        }
                    }

                    Log.i(account.name + " done state=" + state);
@ -1202,7 +1207,12 @@ public class ServiceSynchronize extends LifecycleService {
                            } finally {
                                // Cleanup
                                am.cancel(pi);
-                                unregisterReceiver(alarm);
+                                try {
+                                    unregisterReceiver(alarm);
+                                } catch (IllegalArgumentException ex) {
+                                    Log.w(new IllegalStateException("Killed", ex));
+                                    reload(ServiceSynchronize.this, "killed");
+                                }
                            }
                        }