eliminate old NS sync style

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java

@@ -27,7 +27,6 @@ import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.openhumans.OpenHumansUploader;
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin;
 import info.nightscout.androidaps.utils.DateUtil;
@@ -46,12 +45,9 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     @Inject VirtualPumpPlugin virtualPumpPlugin;
     @Inject OpenHumansUploader openHumansUploader;
     @Inject ActivePlugin activePlugin;
-    @Inject NSUpload nsUpload;
     @Inject DateUtil dateUtil;
 
     public static final String DATABASE_NAME = "AndroidAPSDb";
-    public static final String DATABASE_DANARHISTORY = "DanaRHistory";
-    public static final String DATABASE_DBREQUESTS = "DBRequests";
 
     private static final int DATABASE_VERSION = 13;
 
@@ -71,7 +67,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) {
         try {
             aapsLogger.info(LTag.DATABASE, "onCreate");
-            TableUtils.createTableIfNotExists(connectionSource, DbRequest.class);
             TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
             TableUtils.createTableIfNotExists(connectionSource, InsightBolusID.class);
             TableUtils.createTableIfNotExists(connectionSource, InsightPumpID.class);
@@ -95,7 +90,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
             if (oldVersion < 7) {
                 aapsLogger.info(LTag.DATABASE, "onUpgrade");
-                TableUtils.dropTable(connectionSource, DbRequest.class, true);
                 onCreate(database, connectionSource);
             } else if (oldVersion < 10) {
                 TableUtils.createTableIfNotExists(connectionSource, InsightHistoryOffset.class);
@@ -138,9 +132,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     public void resetDatabases() {
         try {
-            TableUtils.dropTable(connectionSource, DbRequest.class, true);
             TableUtils.dropTable(connectionSource, OmnipodHistoryRecord.class, true);
-            TableUtils.createTableIfNotExists(connectionSource, DbRequest.class);
             TableUtils.createTableIfNotExists(connectionSource, OmnipodHistoryRecord.class);
             updateEarliestDataChange(0);
         } catch (SQLException e) {
@@ -160,10 +152,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 
     // ------------------ getDao -------------------------------------------
 
-    private Dao<DbRequest, String> getDaoDbRequest() throws SQLException {
-        return getDao(DbRequest.class);
-    }
-
     private Dao<InsightPumpID, Long> getDaoInsightPumpID() throws SQLException {
         return getDao(InsightPumpID.class);
     }
@@ -184,76 +172,6 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return getDao(OHQueueItem.class);
     }
 
-    public long roundDateToSec(long date) {
-        long rounded = date - date % 1000;
-        if (rounded != date)
-            aapsLogger.debug(LTag.DATABASE, "Rounding " + date + " to " + rounded);
-        return rounded;
-    }
-
-    // ------------- DbRequests handling -------------------
-
-    public void create(DbRequest dbr) throws SQLException {
-        getDaoDbRequest().create(dbr);
-    }
-
-    public int delete(DbRequest dbr) {
-        try {
-            return getDaoDbRequest().delete(dbr);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return 0;
-    }
-
-    public int deleteDbRequest(String nsClientId) {
-        try {
-            return getDaoDbRequest().deleteById(nsClientId);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        return 0;
-    }
-
-    public void deleteDbRequestbyMongoId(String action, String id) {
-        try {
-            QueryBuilder<DbRequest, String> queryBuilder = getDaoDbRequest().queryBuilder();
-            // By nsID
-            Where where = queryBuilder.where();
-            where.eq("_id", id).and().eq("action", action);
-            queryBuilder.limit(10L);
-            PreparedQuery<DbRequest> preparedQuery = queryBuilder.prepare();
-            List<DbRequest> dbList = getDaoDbRequest().query(preparedQuery);
-            for (DbRequest r : dbList) delete(r);
-            // By nsClientID
-            where = queryBuilder.where();
-            where.eq("nsClientID", id).and().eq("action", action);
-            queryBuilder.limit(10L);
-            preparedQuery = queryBuilder.prepare();
-            dbList = getDaoDbRequest().query(preparedQuery);
-            for (DbRequest r : dbList) delete(r);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public void deleteAllDbRequests() {
-        try {
-            TableUtils.clearTable(connectionSource, DbRequest.class);
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
-    public CloseableIterator getDbRequestIterator() {
-        try {
-            return getDaoDbRequest().closeableIterator();
-        } catch (SQLException e) {
-            aapsLogger.error("Unhandled exception", e);
-            return null;
-        }
-    }
-
     public static void updateEarliestDataChange(long newDate) {
         if (earliestDataChange == null) {
             earliestDataChange = newDate;

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelperProvider.java

@@ -25,38 +25,6 @@ public class DatabaseHelperProvider implements DatabaseHelperInterface {
         MainApp.Companion.getDbHelper().createOrUpdate(record);
     }
 
-    @Override public long size(@NonNull String table) {
-        return MainApp.Companion.getDbHelper().size(table);
-    }
-
-    @Override public void create(@NonNull DbRequest record) {
-        try {
-            MainApp.Companion.getDbHelper().create(record);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override public void deleteAllDbRequests() {
-        MainApp.Companion.getDbHelper().deleteAllDbRequests();
-    }
-
-    @Override public int deleteDbRequest(@NonNull String id) {
-        return MainApp.Companion.getDbHelper().deleteDbRequest(id);
-    }
-
-    @Override public void deleteDbRequestbyMongoId(@NonNull String action, @NonNull String _id) {
-        MainApp.Companion.getDbHelper().deleteDbRequestbyMongoId(action, _id);
-    }
-
-    @NonNull @Override public CloseableIterator<DbRequest> getDbRequestIterator() {
-        return MainApp.Companion.getDbHelper().getDbRequestIterator();
-    }
-
-    @Override public long roundDateToSec(long date) {
-        return MainApp.Companion.getDbHelper().roundDateToSec(date);
-    }
-
     @Override public boolean createOrUpdate(@NonNull TemporaryBasal tempBasal) {
 //        return MainApp.Companion.getDbHelper().createOrUpdate(tempBasal);
         return false;

app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppModule.kt

@@ -12,13 +12,11 @@ import info.nightscout.androidaps.db.DatabaseHelperProvider
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
 import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefsImpl
 import info.nightscout.androidaps.plugins.general.nsclient.DataSyncSelectorImplementation
-import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.PumpSyncImplementation
@@ -66,16 +64,6 @@ open class AppModule {
     @Singleton
     internal fun provideSchedulers(): AapsSchedulers = DefaultAapsSchedulers()
 
-    @Provides
-    @Singleton
-    fun providesUploadQueue(
-        aapsLogger: AAPSLogger,
-        databaseHelper: DatabaseHelperInterface,
-        context: Context,
-        sp: SP,
-        rxBus: RxBusWrapper
-    ): UploadQueueInterface = UploadQueue(aapsLogger, databaseHelper, context, sp, rxBus)
-
     @Provides
     @Singleton
     fun provideProfileFunction(aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePlugin, repository: AppRepository, dateUtil: DateUtil): ProfileFunction {

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt

@@ -10,6 +10,7 @@ import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.extensions.toJson
+import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import javax.inject.Inject
@@ -21,7 +22,8 @@ class DataSyncSelectorImplementation @Inject constructor(
     private val profileFunction: ProfileFunction,
     private val nsClientPlugin: NSClientPlugin,
     private val activePlugin: ActivePlugin,
-    private val appRepository: AppRepository
+    private val appRepository: AppRepository,
+    private val localProfilePlugin: LocalProfilePlugin
 ) : DataSyncSelector {
 
     override fun resetToNextFullSync() {
@@ -36,6 +38,7 @@ class DataSyncSelectorImplementation @Inject constructor(
         sp.remove(R.string.key_ns_extended_bolus_last_synced_id)
         sp.remove(R.string.key_ns_therapy_event_last_synced_id)
         sp.remove(R.string.key_ns_profile_switch_last_synced_id)
+        sp.remove(R.string.key_ns_profile_store_last_synced_timestamp)
     }
 
     override fun confirmLastBolusIdIfGreater(lastSynced: Long) {
@@ -445,4 +448,19 @@ class DataSyncSelectorImplementation @Inject constructor(
         }
         return false
     }
+
+    override fun confirmLastProfileStore(lastSynced: Long) {
+        sp.putLong(R.string.key_ns_profile_store_last_synced_timestamp, lastSynced)
+    }
+
+    override fun processChangedProfileStore() {
+        val lastSync = sp.getLong(R.string.key_ns_profile_store_last_synced_timestamp, 0)
+        val lastChange = sp.getLong(R.string.key_local_profile_last_change, 0)
+        if (lastChange == 0L) return
+        localProfilePlugin.createProfileStore()
+        val profileJson = localProfilePlugin.profile?.data ?: return
+        if (sp.getBoolean(R.string.key_ns_uploadlocalprofile, false))
+            if (lastChange > lastSync)
+                nsClientPlugin.nsClientService?.dbAdd("profile", profileJson, DataSyncSelector.PairProfileStore(profileJson, dateUtil.now()))
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddAckWorker.kt

@@ -147,7 +147,7 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastCarbsIdIfGreater(pair.updateRecordId)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked Carbs" + pair.value.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked Carbs " + pair.value.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedCarbsCompat()
             }
@@ -166,7 +166,7 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastBolusCalculatorResultsIdIfGreater(pair.updateRecordId)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked BolusCalculatorResult" + pair.value.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked BolusCalculatorResult " + pair.value.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedBolusCalculatorResultsCompat()
             }
@@ -185,7 +185,7 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastTemporaryBasalIdIfGreater(pair.updateRecordId)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryBasal" + pair.value.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked TemporaryBasal " + pair.value.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedTemporaryBasalsCompat()
             }
@@ -204,7 +204,7 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastExtendedBolusIdIfGreater(pair.updateRecordId)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked ExtendedBolus" + pair.value.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ExtendedBolus " + pair.value.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedTemporaryBasalsCompat()
             }
@@ -223,7 +223,7 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastProfileSwitchIdIfGreater(pair.updateRecordId)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileSwitch" + pair.value.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileSwitch " + pair.value.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedTemporaryBasalsCompat()
             }
@@ -242,10 +242,15 @@ class NSClientAddAckWorker(
                         dataSyncSelector.confirmLastDeviceStatusIdIfGreater(deviceStatus.id)
                     }
                     .blockingGet()
-                rxBus.send(EventNSClientNewLog("DBADD", "Acked DeviceStatus" + deviceStatus.interfaceIDs.nightscoutId))
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked DeviceStatus " + deviceStatus.interfaceIDs.nightscoutId))
                 // Send new if waiting
                 dataSyncSelector.processChangedDeviceStatusesCompat()
             }
+
+            is PairProfileStore              -> {
+                dataSyncSelector.confirmLastProfileStore(ack.originalObject.timestampSync)
+                rxBus.send(EventNSClientNewLog("DBADD", "Acked ProfileStore " + ack.id))
+            }
         }
         return ret
     }

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/UploadQueue.java

@@ -1,70 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.SystemClock;
-
-import info.nightscout.androidaps.R;
-import info.nightscout.androidaps.db.DatabaseHelper;
-import info.nightscout.androidaps.db.DbRequest;
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
-import info.nightscout.androidaps.plugins.general.nsclient.services.NSClientService;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-/**
- * Created by mike on 21.02.2016.
- */
-public class UploadQueue implements UploadQueueInterface {
-    private final AAPSLogger aapsLogger;
-    private final DatabaseHelperInterface databaseHelper;
-    private final Context context;
-    private final SP sp;
-    private final RxBusWrapper rxBus;
-
-    public UploadQueue(
-            AAPSLogger aapsLogger,
-            DatabaseHelperInterface databaseHelper,
-            Context context,
-            SP sp,
-            RxBusWrapper rxBus
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.databaseHelper = databaseHelper;
-        this.context = context;
-        this.sp = sp;
-        this.rxBus = rxBus;
-    }
-
-    public String status() {
-        return "QUEUE: " + databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
-    }
-
-    @Override
-    public long size() {
-        return databaseHelper.size(DatabaseHelper.DATABASE_DBREQUESTS);
-    }
-
-    private void startService() {
-        if (NSClientService.handler == null) {
-            context.startService(new Intent(context, NSClientService.class));
-            SystemClock.sleep(2000);
-        }
-    }
-
-    public void add(final DbRequest dbr) {
-        if (sp.getBoolean(R.string.key_ns_noupload, false)) return;
-        aapsLogger.debug(LTag.NSCLIENT, "Adding to queue: " + dbr.log());
-        try {
-            databaseHelper.create(dbr);
-        } catch (Exception e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-        rxBus.send(new EventNSClientResend("newdata"));
-    }
-
-}

app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.java

@@ -14,14 +14,12 @@ import androidx.work.OneTimeWorkRequest;
 
 import com.google.common.base.Charsets;
 import com.google.common.hash.Hashing;
-import com.j256.ormlite.dao.CloseableIterator;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.net.URISyntaxException;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,17 +27,15 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerService;
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.interfaces.Config;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.database.AppRepository;
-import info.nightscout.androidaps.db.DbRequest;
 import info.nightscout.androidaps.events.EventAppExit;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventPreferenceChange;
+import info.nightscout.androidaps.interfaces.Config;
 import info.nightscout.androidaps.interfaces.DataSyncSelector;
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
 import info.nightscout.androidaps.interfaces.PluginType;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
@@ -97,7 +93,6 @@ public class NSClientService extends DaggerService {
     @Inject BuildHelper buildHelper;
     @Inject Config config;
     @Inject DateUtil dateUtil;
-    @Inject UploadQueueInterface uploadQueue;
     @Inject DataWorker dataWorker;
     @Inject DataSyncSelector dataSyncSelector;
     @Inject AppRepository repository;
@@ -122,7 +117,6 @@ public class NSClientService extends DaggerService {
     private String nsDevice = "";
     private final Integer nsHours = 48;
 
-    public long lastResendTime = 0;
     public long lastAckTime = 0;
 
     public long latestDateInReceivedData = 0;
@@ -533,11 +527,9 @@ public class NSClientService extends DaggerService {
                 try {
 
                     JSONObject data = (JSONObject) args[0];
-                    boolean broadcastProfile = false;
                     try {
                         // delta means only increment/changes are comming
                         boolean isDelta = data.has("delta");
-                        boolean isFull = !isDelta;
                         rxBus.send(new EventNSClientNewLog("DATA", "Data packet #" + dataCounter++ + (isDelta ? " delta" : " full")));
 
                         if (data.has("status")) {
@@ -576,7 +568,7 @@ public class NSClientService extends DaggerService {
                             JSONArray addedOrUpdatedTreatments = new JSONArray();
                             if (treatments.length() > 0)
                                 rxBus.send(new EventNSClientNewLog("DATA", "received " + treatments.length() + " treatments"));
-                            for (Integer index = 0; index < treatments.length(); index++) {
+                            for (int index = 0; index < treatments.length(); index++) {
                                 JSONObject jsonTreatment = treatments.getJSONObject(index);
                                 String action = JsonHelper.safeGetStringAllowNull(jsonTreatment, "action", null);
                                 long mills = JsonHelper.safeGetLong(jsonTreatment, "mills");
@@ -689,20 +681,6 @@ public class NSClientService extends DaggerService {
         }
     };
 
-    public void dbUpdate(DbRequest dbr, NSUpdateAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("_id", dbr._id);
-            message.put("data", new JSONObject(dbr.data));
-            mSocket.emit("dbUpdate", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBUPDATE " + dbr.collection, "Sent " + dbr._id));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
     public void dbUpdate(String collection, String _id, JSONObject data, Object originalObject) {
         try {
             if (!isConnected || !hasWriteAuth) return;
@@ -717,19 +695,6 @@ public class NSClientService extends DaggerService {
         }
     }
 
-    public void dbRemove(DbRequest dbr, NSUpdateAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("_id", dbr._id);
-            mSocket.emit("dbRemove", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBREMOVE " + dbr.collection, "Sent " + dbr._id));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
     public void dbRemove(String collection, String _id, Object originalObject) {
         try {
             if (!isConnected || !hasWriteAuth) return;
@@ -743,19 +708,6 @@ public class NSClientService extends DaggerService {
         }
     }
 
-    public void dbAdd(DbRequest dbr, NSAddAck ack) {
-        try {
-            if (!isConnected || !hasWriteAuth) return;
-            JSONObject message = new JSONObject();
-            message.put("collection", dbr.collection);
-            message.put("data", new JSONObject(dbr.data));
-            mSocket.emit("dbAdd", message, ack);
-            rxBus.send(new EventNSClientNewLog("DBADD " + dbr.collection, "Sent " + dbr.nsClientID));
-        } catch (JSONException e) {
-            aapsLogger.error("Unhandled exception", e);
-        }
-    }
-
     public void dbAdd(String collection, JSONObject data, Object originalObject) {
         try {
             if (!isConnected || !hasWriteAuth) return;
@@ -799,41 +751,7 @@ public class NSClientService extends DaggerService {
             dataSyncSelector.processChangedFoodsCompat();
             dataSyncSelector.processChangedTherapyEventsCompat();
             dataSyncSelector.processChangedDeviceStatusesCompat();
-
+            dataSyncSelector.processChangedProfileStore();
-            if (uploadQueue.size() == 0)
-                return;
-
-            if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
-                aapsLogger.debug(LTag.NSCLIENT, "Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
-                return;
-            }
-            lastResendTime = System.currentTimeMillis();
-
-            CloseableIterator<DbRequest> iterator;
-            int maxcount = 30;
-            try {
-                iterator = databaseHelper.getDbRequestIterator();
-                try {
-                    while (iterator.hasNext() && maxcount > 0) {
-                        DbRequest dbr = iterator.next();
-                        if (dbr.action.equals("dbAdd")) {
-                            NSAddAck addAck = new NSAddAck(aapsLogger, rxBus, null);
-                            dbAdd(dbr, addAck);
-                        } else if (dbr.action.equals("dbRemove")) {
-                            NSUpdateAck removeAck = new NSUpdateAck("dbRemove", dbr._id, aapsLogger, rxBus, null);
-                            dbRemove(dbr, removeAck);
-                        } else if (dbr.action.equals("dbUpdate")) {
-                            NSUpdateAck updateAck = new NSUpdateAck("dbUpdate", dbr._id, aapsLogger, rxBus, null);
-                            dbUpdate(dbr, updateAck);
-                        }
-                        maxcount--;
-                    }
-                } finally {
-                    iterator.close();
-                }
-            } catch (SQLException e) {
-                aapsLogger.error("Unhandled exception", e);
-            }
 
             rxBus.send(new EventNSClientNewLog("QUEUE", "Resend ended: " + reason));
         });

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt

@@ -12,7 +12,6 @@ import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.HardLimits
@@ -35,7 +34,6 @@ class LocalProfilePlugin @Inject constructor(
     resourceHelper: ResourceHelper,
     private val sp: SP,
     private val profileFunction: ProfileFunction,
-    private val nsUpload: NSUpload,
     private val activePlugin: ActivePlugin,
     private val hardLimits: HardLimits,
     private val dateUtil: DateUtil
@@ -144,7 +142,7 @@ class LocalProfilePlugin @Inject constructor(
             if (name.contains(".")) namesOK = false
         }
         if (namesOK)
-            rawProfile?.let { nsUpload.uploadProfileStore(it.data) }
+            sp.putLong(R.string.key_local_profile_last_change, dateUtil.now())
         else
             activity?.let {
                 OKDialog.show(it, "", resourceHelper.gs(R.string.profilenamecontainsdot))

app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt

@@ -139,7 +139,6 @@ open class VirtualPumpPlugin @Inject constructor(
     override fun isHandshakeInProgress(): Boolean = false
 
     override fun connect(reason: String) {
-        //if (!Config.NSCLIENT) NSUpload.uploadDeviceStatus()
         lastDataTime = System.currentTimeMillis()
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPlugin.java

@@ -26,7 +26,6 @@ import info.nightscout.androidaps.interfaces.TreatmentServiceInterface;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.FabricPrivacy;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
@@ -37,12 +36,10 @@ import io.reactivex.disposables.CompositeDisposable;
 @Singleton
 public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface {
 
-    private final AapsSchedulers aapsSchedulers;
     private final SP sp;
     private final RxBusWrapper rxBus;
     private final ProfileFunction profileFunction;
     private final ActivePlugin activePlugin;
-    private final NSUpload nsUpload;
     private final FabricPrivacy fabricPrivacy;
     private final DateUtil dateUtil;
     private final DatabaseHelperInterface databaseHelper;
@@ -63,7 +60,6 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
             SP sp,
             ProfileFunction profileFunction,
             ActivePlugin activePlugin,
-            NSUpload nsUpload,
             FabricPrivacy fabricPrivacy,
             DateUtil dateUtil,
             DatabaseHelperInterface databaseHelper,
@@ -81,13 +77,11 @@ public class TreatmentsPlugin extends PluginBase implements TreatmentsInterface
                 aapsLogger, resourceHelper, injector
         );
         this.rxBus = rxBus;
-        this.aapsSchedulers = aapsSchedulers;
         this.sp = sp;
         this.profileFunction = profileFunction;
         this.activePlugin = activePlugin;
         this.fabricPrivacy = fabricPrivacy;
         this.dateUtil = dateUtil;
-        this.nsUpload = nsUpload;
         this.databaseHelper = databaseHelper;
         this.repository = repository;
     }

app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt

@@ -21,12 +21,10 @@ import info.nightscout.androidaps.dialogs.ProfileViewerDialog
 import info.nightscout.androidaps.events.EventProfileSwitchChanged
 import info.nightscout.androidaps.extensions.getCustomizedName
 import info.nightscout.androidaps.extensions.toVisibility
-import info.nightscout.androidaps.interfaces.UploadQueueInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData
 import info.nightscout.androidaps.plugins.profile.local.LocalProfilePlugin
@@ -55,8 +53,6 @@ class TreatmentsProfileSwitchFragment : DaggerFragment() {
     @Inject lateinit var localProfilePlugin: LocalProfilePlugin
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var fabricPrivacy: FabricPrivacy
-    @Inject lateinit var nsUpload: NSUpload
-    @Inject lateinit var uploadQueue: UploadQueueInterface
     @Inject lateinit var dateUtil: DateUtil
     @Inject lateinit var buildHelper: BuildHelper
     @Inject lateinit var aapsSchedulers: AapsSchedulers

app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt

@@ -23,7 +23,6 @@ import info.nightscout.androidaps.databinding.TreatmentsTemptargetFragmentBindin
 import info.nightscout.androidaps.databinding.TreatmentsTemptargetItemBinding
 import info.nightscout.androidaps.events.EventTempTargetChange
 import info.nightscout.androidaps.interfaces.ProfileFunction
-import info.nightscout.androidaps.interfaces.UploadQueueInterface
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.logging.UserEntryLogger
@@ -58,7 +57,6 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
     @Inject lateinit var aapsLogger: AAPSLogger
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var resourceHelper: ResourceHelper
-    @Inject lateinit var uploadQueue: UploadQueueInterface
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var translator: Translator
     @Inject lateinit var dateUtil: DateUtil
@@ -151,7 +149,7 @@ class TreatmentsTempTargetFragment : DaggerFragment() {
         _binding = null
     }
 
-    private inner class RecyclerViewAdapter internal constructor(private var tempTargetList: List<TemporaryTarget>) : RecyclerView.Adapter<TempTargetsViewHolder>() {
+    private inner class RecyclerViewAdapter(private var tempTargetList: List<TemporaryTarget>) : RecyclerView.Adapter<TempTargetsViewHolder>() {
 
         private val dbRecord = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet()
         private val currentlyActiveTarget = if (dbRecord is ValueWrapper.Existing) dbRecord.value else null

app/src/main/res/values/strings.xml

@@ -47,6 +47,8 @@
     <string name="key_ns_temporary_basal_last_synced_id" translatable="false">ns_temporary_basal_last_synced_id</string>
     <string name="key_ns_extended_bolus_last_synced_id" translatable="false">ns_extended_bolus_last_synced_id</string>
     <string name="key_ns_profile_switch_last_synced_id" translatable="false">profile_switch_last_synced_id</string>
+    <string name="key_ns_profile_store_last_synced_timestamp" translatable="false">ns_profile_store_last_synced_timestamp</string>
+    <string name="key_local_profile_last_change" translatable="false">local_profile_last_change</string>
 
     <string name="treatmentssafety_title">Treatments safety</string>
     <string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>

app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt

@@ -18,7 +18,6 @@ import info.nightscout.androidaps.plugins.constraints.objectives.ObjectivesPlugi
 import info.nightscout.androidaps.plugins.constraints.objectives.objectives.Objective
 import info.nightscout.androidaps.plugins.constraints.safety.SafetyPlugin
 import info.nightscout.androidaps.plugins.general.maintenance.LoggerUtils
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
@@ -64,8 +63,6 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
     @Mock lateinit var glimpPlugin: GlimpPlugin
     @Mock lateinit var sensitivityOref1Plugin: SensitivityOref1Plugin
     @Mock lateinit var profiler: Profiler
-    @Mock lateinit var nsUpload: NSUpload
-    @Mock lateinit var uploadQueue: UploadQueueInterface
     @Mock lateinit var uel: UserEntryLogger
     @Mock lateinit var loggerUtils: LoggerUtils
     @Mock lateinit var databaseHelper: DatabaseHelperInterface
@@ -144,7 +141,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() {
         comboPlugin = ComboPlugin(injector, aapsLogger, rxBus, resourceHelper, profileFunction, sp, commandQueue, context, databaseHelper, pumpSync, dateUtil)
         danaRPlugin = DanaRPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync)
         danaRSPlugin = DanaRSPlugin(injector, aapsLogger, aapsSchedulers, rxBus, context, resourceHelper, constraintChecker, profileFunction, sp, commandQueue, danaPump, pumpSync, detailedBolusInfoStorage, temporaryBasalStorage, fabricPrivacy, dateUtil)
-        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, nsUpload, context, uploadQueue, ConfigImpl(), dateUtil, databaseHelper, pumpSync)
+        insightPlugin = LocalInsightPlugin(injector, aapsLogger, rxBus, resourceHelper, treatmentsInterface, sp, commandQueue, profileFunction, context, ConfigImpl(), dateUtil, databaseHelper, pumpSync)
         openAPSSMBPlugin = OpenAPSSMBPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, sp, dateUtil, repository, glucoseStatusProvider)
         openAPSAMAPlugin = OpenAPSAMAPlugin(injector, aapsLogger, rxBus, constraintChecker, resourceHelper, profileFunction, context, activePlugin, iobCobCalculator, hardLimits, profiler, fabricPrivacy, dateUtil, repository, glucoseStatusProvider)
         safetyPlugin = SafetyPlugin(injector, aapsLogger, resourceHelper, sp, rxBus, constraintChecker, openAPSAMAPlugin, openAPSSMBPlugin, sensitivityOref1Plugin, activePlugin, hardLimits, BuildHelper(ConfigImpl(), loggerUtils), iobCobCalculator, ConfigImpl(), dateUtil)

app/src/test/java/info/nightscout/androidaps/plugins/treatments/TreatmentsPluginTest.kt

@@ -6,8 +6,6 @@ import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.UploadQueueInterface
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -24,8 +22,6 @@ class TreatmentsPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var sp: SP
     @Mock lateinit var treatmentService: TreatmentService
-    @Mock lateinit var nsUpload: NSUpload
-    @Mock lateinit var uploadQueue: UploadQueueInterface
     @Mock lateinit var repository: AppRepository
     @Mock lateinit var databaseHelper: DatabaseHelperInterface
 

automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionAlarmTest.kt

@@ -8,7 +8,6 @@ import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.TimerUtil
@@ -24,7 +23,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(NSUpload::class, RxBusWrapper::class, TimerUtil::class)
+@PrepareForTest(RxBusWrapper::class, TimerUtil::class)
 class ActionAlarmTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper

automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt

@@ -6,11 +6,8 @@ import info.nightscout.androidaps.TestBase
 import info.nightscout.androidaps.automation.R
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.database.AppRepository
-import info.nightscout.androidaps.database.transactions.InsertTherapyEventAnnouncementTransaction
-import info.nightscout.androidaps.database.transactions.Transaction
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.automation.elements.InputString
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
@@ -21,12 +18,11 @@ import org.mockito.ArgumentMatchers
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.Mockito.`when`
-import org.mockito.Mockito.any
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(NSUpload::class, RxBusWrapper::class)
+@PrepareForTest(RxBusWrapper::class)
 class ActionNotificationTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper

core/src/main/java/info/nightscout/androidaps/db/DbRequest.java

@@ -1,86 +0,0 @@
-package info.nightscout.androidaps.db;
-
-import com.j256.ormlite.field.DatabaseField;
-import com.j256.ormlite.table.DatabaseTable;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-/**
- * Created by mike on 27.02.2016.
- * <p>
- * Allowed actions "dbAdd" || "dbUpdate" || "dbUpdateUnset" || "dbRemove"
- */
-@DatabaseTable(tableName = "DBRequests")
-public class DbRequest {
-
-    @DatabaseField(id = true)
-    public String nsClientID = null;
-
-    @DatabaseField
-    public String action = null;
-
-    @DatabaseField
-    public String collection = null;
-
-    @DatabaseField
-    public String data = null;
-
-    @DatabaseField
-    public String _id = null;
-
-    public DbRequest() {
-    }
-
-    // dbAdd
-    public DbRequest(String action, String collection, JSONObject json, long nsClientId) {
-        this.action = action;
-        this.collection = collection;
-        this.nsClientID = "" + nsClientId;
-        try {
-            json.put("NSCLIENT_ID", nsClientID);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        this.data = json.toString();
-        this._id = "";
-    }
-
-    // dbUpdate, dbUpdateUnset
-    public DbRequest(String action, String collection, String _id, JSONObject json, long nsClientId) {
-        this.action = action;
-        this.collection = collection;
-        this.nsClientID = "" + nsClientId;
-        try {
-            json.put("NSCLIENT_ID", nsClientID);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        this.data = json.toString();
-        this._id = _id;
-    }
-
-    // dbRemove
-    public DbRequest(String action, String collection, String _id, long nsClientId) {
-        JSONObject json = new JSONObject();
-        this.action = action;
-        this.collection = collection;
-        this.nsClientID = "" + nsClientId;
-        try {
-            json.put("NSCLIENT_ID", nsClientID);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        this.data = json.toString();
-        this._id = _id;
-    }
-
-    public String log() {
-        return
-                "\nnsClientID:" + nsClientID +
-                        "\naction:" + action +
-                        "\ncollection:" + collection +
-                        "\ndata:" + data +
-                        "\n_id:" + _id;
-    }
-}

core/src/main/java/info/nightscout/androidaps/interfaces/DataSyncSelector.kt

@@ -2,6 +2,7 @@ package info.nightscout.androidaps.interfaces
 
 import info.nightscout.androidaps.database.entities.DeviceStatus
 import info.nightscout.androidaps.database.entities.*
+import org.json.JSONObject
 
 interface DataSyncSelector {
 
@@ -15,6 +16,7 @@ interface DataSyncSelector {
     data class PairTemporaryBasal(val value: TemporaryBasal, val updateRecordId: Long)
     data class PairExtendedBolus(val value: ExtendedBolus, val updateRecordId: Long)
     data class PairProfileSwitch(val value: ProfileSwitch, val updateRecordId: Long)
+    data class PairProfileStore(val value: JSONObject, val timestampSync: Long)
 
     fun resetToNextFullSync()
 
@@ -72,4 +74,7 @@ interface DataSyncSelector {
     fun changedProfileSwitch() : List<ProfileSwitch>
     // Until NS v3
     fun processChangedProfileSwitchesCompat(): Boolean
+
+    fun confirmLastProfileStore(lastSynced: Long)
+    fun processChangedProfileStore()
 }

core/src/main/java/info/nightscout/androidaps/interfaces/DatabaseHelperInterface.kt

@@ -1,8 +1,6 @@
 package info.nightscout.androidaps.interfaces
 
-import com.j256.ormlite.dao.CloseableIterator
 import info.nightscout.androidaps.db.*
-import org.json.JSONObject
 
 interface DatabaseHelperInterface {
 
@@ -13,14 +11,7 @@ interface DatabaseHelperInterface {
     fun createOrUpdate(record: InsightPumpID)
     fun createOrUpdate(record: InsightHistoryOffset)
     fun createOrUpdate(record: OHQueueItem)
-    fun create(record: DbRequest)
-    fun size(table: String): Long
-    fun deleteAllDbRequests()
-    fun deleteDbRequest(id: String): Int
     fun delete(extendedBolus: ExtendedBolus)
-    fun deleteDbRequestbyMongoId(action: String, _id: String)
-    fun getDbRequestIterator(): CloseableIterator<DbRequest>
-    fun roundDateToSec(date: Long): Long
     fun createOrUpdate(tempBasal: TemporaryBasal): Boolean
     @Deprecated("Use new DB")
     fun findTempBasalByPumpId(id: Long): TemporaryBasal?

core/src/main/java/info/nightscout/androidaps/interfaces/UploadQueueInterface.java

@@ -1,12 +0,0 @@
-package info.nightscout.androidaps.interfaces;
-
-import org.json.JSONObject;
-
-import info.nightscout.androidaps.db.DbRequest;
-
-public interface UploadQueueInterface {
-
-    long size();
-
-    void add(DbRequest dbRequest);
-}

core/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSUpload.java

@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.general.nsclient;
-
-import org.json.JSONObject;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import info.nightscout.androidaps.core.R;
-import info.nightscout.androidaps.db.DbRequest;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
-import info.nightscout.androidaps.logging.AAPSLogger;
-import info.nightscout.androidaps.utils.sharedPreferences.SP;
-
-/**
- * Created by mike on 26.05.2017.
- */
-@Singleton
-public class NSUpload {
-
-    private final AAPSLogger aapsLogger;
-    private final SP sp;
-    private final UploadQueueInterface uploadQueue;
-
-    @Inject
-    public NSUpload(
-            AAPSLogger aapsLogger,
-            SP sp,
-            UploadQueueInterface uploadQueue
-    ) {
-        this.aapsLogger = aapsLogger;
-        this.sp = sp;
-        this.uploadQueue = uploadQueue;
-    }
-
-    public void uploadProfileStore(JSONObject profileStore) {
-        if (sp.getBoolean(R.string.key_ns_uploadlocalprofile, false)) {
-            uploadQueue.add(new DbRequest("dbAdd", "profile", profileStore, System.currentTimeMillis()));
-        }
-    }
-}

danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java

@@ -194,7 +194,6 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
-            //NSUpload.uploadDeviceStatus();
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {

danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java

@@ -231,7 +231,6 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
-            //NSUpload.uploadDeviceStatus();
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {

danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java

@@ -200,7 +200,6 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
             rxBus.send(new EventDanaRNewStatus());
             rxBus.send(new EventInitializationChanged());
-            //NSUpload.uploadDeviceStatus();
             if (danaPump.getDailyTotalUnits() > danaPump.getMaxDailyTotalUnits() * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMP, "Approaching daily limit: " + danaPump.getDailyTotalUnits() + "/" + danaPump.getMaxDailyTotalUnits());
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {

danars/src/main/java/info/nightscout/androidaps/danars/services/DanaRSService.kt

@@ -198,7 +198,6 @@ class DanaRSService : DaggerService() {
             danaPump.fromTemporaryBasal(tbr)
             rxBus.send(EventDanaRNewStatus())
             rxBus.send(EventInitializationChanged())
-            //NSUpload.uploadDeviceStatus();
             if (danaPump.dailyTotalUnits > danaPump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
                 aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + danaPump.dailyTotalUnits + "/" + danaPump.maxDailyTotalUnits)
                 if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {

danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsPacketNotifyAlarmTest.kt

@@ -32,7 +32,6 @@ class DanaRsPacketNotifyAlarmTest : DanaRSTestBase() {
         // test params
         Assert.assertEquals(null, packet.requestParams)
         // test message decoding
-        // handle message testing fails on non-error byte because of NSUpload not properly mocked
         packet.handleMessage(createArray(17, 0x01.toByte()))
         Assert.assertEquals(false, packet.failed)
         // no error

insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java

@@ -55,12 +55,10 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpPluginBase;
 import info.nightscout.androidaps.interfaces.PumpSync;
 import info.nightscout.androidaps.interfaces.TreatmentsInterface;
-import info.nightscout.androidaps.interfaces.UploadQueueInterface;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.common.ManufacturerType;
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress;
@@ -146,9 +144,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
     private final SP sp;
     private final CommandQueueProvider commandQueue;
     private final ProfileFunction profileFunction;
-    private final NSUpload nsUpload;
     private final Context context;
-    private final UploadQueueInterface uploadQueue;
     private final DateUtil dateUtil;
     private final DatabaseHelperInterface databaseHelper;
     private final PumpSync pumpSync;
@@ -207,9 +203,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
             SP sp,
             CommandQueueProvider commandQueue,
             ProfileFunction profileFunction,
-            NSUpload nsUpload,
             Context context,
-            UploadQueueInterface uploadQueue,
             Config config,
             DateUtil dateUtil,
             DatabaseHelperInterface databaseHelper,
@@ -233,9 +227,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Constrai
         this.sp = sp;
         this.commandQueue = commandQueue;
         this.profileFunction = profileFunction;
-        this.nsUpload = nsUpload;
         this.context = context;
-        this.uploadQueue = uploadQueue;
         this.dateUtil = dateUtil;
         this.databaseHelper = databaseHelper;
         this.pumpSync = pumpSync;