From e06c938b0dd85e08f63222161018720fe490326a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 28 Sep 2021 10:18:20 +0200
Subject: [PATCH] Remove life cycle observers

---
 .../java/eu/faircode/email/ActivityBase.java    |  1 +
 .../java/eu/faircode/email/AdapterAccount.java  |  1 +
 .../java/eu/faircode/email/AdapterAnswer.java   |  1 +
 .../eu/faircode/email/AdapterAttachment.java    |  1 +
 .../java/eu/faircode/email/AdapterContact.java  |  1 +
 .../java/eu/faircode/email/AdapterFolder.java   |  1 +
 .../java/eu/faircode/email/AdapterIdentity.java |  1 +
 .../java/eu/faircode/email/AdapterImage.java    |  1 +
 .../main/java/eu/faircode/email/AdapterLog.java |  1 +
 .../eu/faircode/email/AdapterNavSearch.java     |  1 +
 .../eu/faircode/email/AdapterOperation.java     |  1 +
 .../java/eu/faircode/email/AdapterOrder.java    |  1 +
 .../java/eu/faircode/email/AdapterRule.java     |  1 +
 .../eu/faircode/email/AdapterRuleMatch.java     |  1 +
 app/src/main/java/eu/faircode/email/Helper.java |  6 ++++++
 .../eu/faircode/email/PopupMenuLifecycle.java   | 17 +++++++++--------
 .../eu/faircode/email/ViewModelMessages.java    |  3 +++
 17 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 0cdc47a52e..6a12e4044d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -510,6 +510,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             public void onDestroyed() {
                 Log.d("Removing back listener=" + listener);
                 keyPressedListeners.remove(listener);
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index e6320e4a93..053b6dc6b3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -573,6 +573,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
             public void onDestroyed() {
                 Log.d(AdapterAccount.this + " parent destroyed");
                 AdapterAccount.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAnswer.java b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
index b17ffe7240..5e209ac396 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAnswer.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
@@ -286,6 +286,7 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
             public void onDestroyed() {
                 Log.d(AdapterAnswer.this + " parent destroyed");
                 AdapterAnswer.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterAttachment.java b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
index 1260ec69ca..0d6ccfdd04 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAttachment.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAttachment.java
@@ -342,6 +342,7 @@ public class AdapterAttachment extends RecyclerView.Adapter<AdapterAttachment.Vi
             public void onDestroyed() {
                 Log.d(AdapterAttachment.this + " parent destroyed");
                 AdapterAttachment.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index a254f6e079..96bc0865ed 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -366,6 +366,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
             public void onDestroyed() {
                 Log.d(AdapterContact.this + " parent destroyed");
                 AdapterContact.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 3520dc9d1a..ef39524902 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -1152,6 +1152,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
             public void onDestroyed() {
                 Log.d(AdapterFolder.this + " parent destroyed");
                 AdapterFolder.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index a1f4919367..976f259119 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -359,6 +359,7 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
             public void onDestroyed() {
                 Log.d(AdapterIdentity.this + " parent destroyed");
                 AdapterIdentity.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java
index 44589b1be2..9ae07f2374 100644
--- a/app/src/main/java/eu/faircode/email/AdapterImage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterImage.java
@@ -182,6 +182,7 @@ public class AdapterImage extends RecyclerView.Adapter<AdapterImage.ViewHolder>
             public void onDestroyed() {
                 Log.d(AdapterImage.this + " parent destroyed");
                 AdapterImage.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterLog.java b/app/src/main/java/eu/faircode/email/AdapterLog.java
index 8e0fa10d1f..cd0ce755d2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterLog.java
+++ b/app/src/main/java/eu/faircode/email/AdapterLog.java
@@ -138,6 +138,7 @@ public class AdapterLog extends RecyclerView.Adapter<AdapterLog.ViewHolder> {
             public void onDestroyed() {
                 Log.d(AdapterLog.this + " parent destroyed");
                 AdapterLog.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
index 22acfaa69a..b63597ce28 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavSearch.java
@@ -132,6 +132,7 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
             public void onDestroyed() {
                 Log.d(AdapterNavSearch.this + " parent destroyed");
                 AdapterNavSearch.this.manager = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 05f3c929da..de0d5fc593 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -264,6 +264,7 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
             public void onDestroyed() {
                 Log.d(AdapterOperation.this + " parent destroyed");
                 AdapterOperation.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterOrder.java b/app/src/main/java/eu/faircode/email/AdapterOrder.java
index 4eb76474e2..44e8367a27 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOrder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOrder.java
@@ -81,6 +81,7 @@ public class AdapterOrder extends RecyclerView.Adapter<AdapterOrder.ViewHolder>
             public void onDestroyed() {
                 Log.d(AdapterOrder.this + " parent destroyed");
                 AdapterOrder.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index f1d1cae12b..fe496a0211 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -416,6 +416,7 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
             public void onDestroyed() {
                 Log.d(AdapterRule.this + " parent destroyed");
                 AdapterRule.this.parentFragment = null;
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRuleMatch.java b/app/src/main/java/eu/faircode/email/AdapterRuleMatch.java
index ed1c59aea8..31e577e76b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRuleMatch.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRuleMatch.java
@@ -88,6 +88,7 @@ public class AdapterRuleMatch extends RecyclerView.Adapter<AdapterRuleMatch.View
             @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
             public void onDestroyed() {
                 Log.d(AdapterRuleMatch.this + " parent destroyed");
+                owner.getLifecycle().removeObserver(this);
             }
         });
     }
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 4831b743ec..b3349f1860 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -1915,6 +1915,7 @@ public class Helper {
                 public void onDestroy() {
                     Log.i("Authenticate destroyed");
                     ApplicationEx.getMainHandler().post(cancelPrompt);
+                    owner.getLifecycle().removeObserver(this);
                 }
             });
 
@@ -2083,6 +2084,11 @@ public class Helper {
                                     else
                                         intf.onSelected(selected);
                                 }
+
+                                @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+                                public void onDestroy() {
+                                    owner.getLifecycle().removeObserver(this);
+                                }
                             });
                         }
                     }
diff --git a/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java b/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
index 44e232b577..e26cf969b8 100644
--- a/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
+++ b/app/src/main/java/eu/faircode/email/PopupMenuLifecycle.java
@@ -42,13 +42,20 @@ import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.OnLifecycleEvent;
 
-public class PopupMenuLifecycle extends PopupMenu implements LifecycleObserver {
+public class PopupMenuLifecycle extends PopupMenu {
 
     public PopupMenuLifecycle(@NonNull Context context, LifecycleOwner owner, @NonNull View anchor) {
         super(new ContextThemeWrapper(context, R.style.popupMenuStyle), anchor);
         Log.i("Instantiate " + this);
 
-        owner.getLifecycle().addObserver(this);
+        owner.getLifecycle().addObserver(new LifecycleObserver() {
+            @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+            public void onDestroy() {
+                Log.i("Destroy " + this);
+                PopupMenuLifecycle.this.dismiss();
+                owner.getLifecycle().removeObserver(this);
+            }
+        });
     }
 
     public void insertIcons(Context context) {
@@ -88,12 +95,6 @@ public class PopupMenuLifecycle extends PopupMenu implements LifecycleObserver {
         });
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    public void onDestroy() {
-        Log.i("Destroy " + this);
-        this.dismiss();
-    }
-
     static void insertIcons(Context context, Menu menu) {
         for (int i = 0; i < menu.size(); i++) {
             MenuItem item = menu.getItem(i);
diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 34851aa1b0..60adb6db74 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -223,6 +223,8 @@ public class ViewModelMessages extends ViewModel {
                 }
 
                 dump();
+
+                owner.getLifecycle().removeObserver(this);
             }
         });
 
@@ -580,6 +582,7 @@ public class ViewModelMessages extends ViewModel {
                     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
                     public void onDestroyed() {
                         boundary.destroy(state);
+                        owner.getLifecycle().removeObserver(this);
                     }
                 });
             }