From eca62f072f661b0d43d622cd3a685cdbac1f0296 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 13 Aug 2021 16:56:52 +0200
Subject: [PATCH] Check process ID for database access

---
 app/src/main/java/eu/faircode/email/DB.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index eba9d9bf87..ecccd72338 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
@@ -111,8 +112,8 @@ public abstract class DB extends RoomDatabase {
 
     public abstract DaoLog log();
 
-    private static Context sContext;
     private static int sPid;
+    private static Context sContext;
     private static DB sInstance;
 
     private static final String DB_NAME = "fairemail";
@@ -305,17 +306,18 @@ public abstract class DB extends RoomDatabase {
     }
 
     public static synchronized DB getInstance(Context context) {
+        int apid = android.os.Process.myPid();
         Context acontext = context.getApplicationContext();
         if (sInstance != null &&
-                sContext != null && !sContext.equals(acontext))
+                (sPid != apid || !Objects.equals(sContext, acontext)))
             try {
-                Log.e("Orphan database instance pid=" + android.os.Process.myPid() + "/" + sPid);
+                Log.e("Orphan database instance pid=" + apid + "/" + sPid);
                 sInstance = null;
             } catch (Throwable ex) {
                 Log.e(ex);
             }
+        sPid = apid;
         sContext = acontext;
-        sPid = android.os.Process.myPid();
 
         if (sInstance == null) {
             Log.i("Creating database instance pid=" + sPid);