From 937872e80c2f83bdb88c96f2337d0ba619a2f7bd Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 30 Dec 2017 23:01:25 +0100
Subject: [PATCH] fully offline CP

---
 .../receivers/DBAccessReceiver.java           | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
index 3411659d0d..4590490ecf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/receivers/DBAccessReceiver.java
@@ -30,14 +30,6 @@ public class DBAccessReceiver extends BroadcastReceiver {
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                 DBAccessReceiver.class.getSimpleName());
-        NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
-        if (!nsClientInternalPlugin.isEnabled(PluginBase.GENERAL)) {
-            return;
-        }
-        if (SP.getBoolean(R.string.key_ns_noupload, false)) {
-            log.debug("Upload disabled. Message dropped");
-            return;
-        }
         wakeLock.acquire();
         try {
             Bundle bundles = intent.getExtras();
@@ -83,16 +75,22 @@ public class DBAccessReceiver extends BroadcastReceiver {
             }
 
             if (action.equals("dbRemove")) {
-                DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), _id);
-                UploadQueue.add(dbr);
+                if (shouldUpload()) {
+                    DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), _id);
+                    UploadQueue.add(dbr);
+                }
             } else {
                 DbRequest dbr = new DbRequest(action, collection, nsclientid.toString(), data);
                 // this is not used as mongo _id but only for searching in UploadQueue database
                 // if record has to be removed from queue before upload
                 dbr._id = nsclientid.toString();
-                UploadQueue.add(dbr);
-                if (collection.equals("treatments"))
+
+                if (shouldUpload()) {
+                    UploadQueue.add(dbr);
+                }
+                if (collection.equals("treatments")) {
                     genereateTreatmentOfflineBroadcast(dbr);
+                }
             }
 
         } finally {
@@ -101,6 +99,11 @@ public class DBAccessReceiver extends BroadcastReceiver {
 
     }
 
+    public boolean shouldUpload() {
+        NSClientInternalPlugin nsClientInternalPlugin = MainApp.getSpecificPlugin(NSClientInternalPlugin.class);
+        return nsClientInternalPlugin.isEnabled(PluginBase.GENERAL) && !SP.getBoolean(R.string.key_ns_noupload, false);
+    }
+
     public void genereateTreatmentOfflineBroadcast(DbRequest request) {
         if (request.action.equals("dbAdd")) {
             try {