NSClient2 flavor

app/build.gradle

@@ -58,7 +58,6 @@ android {
     compileSdkVersion 27
 
     defaultConfig {
-        applicationId "info.nightscout.androidaps"
         minSdkVersion 21
         targetSdkVersion 25
         multiDexEnabled true
@@ -95,6 +94,7 @@ android {
     productFlavors {
         flavorDimensions "standard"
         full {
+            applicationId "info.nightscout.androidaps"
             dimension "standard"
             resValue "string", "app_name", "AndroidAPS"
             versionName version
@@ -104,11 +104,13 @@ android {
             ]
             buildConfigField "boolean", "APS", "true"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
-            buildConfigField "boolean", "NSCLIENTOLNY", "false"
+            buildConfigField "boolean", "NSCLIENT", "false"
+            buildConfigField "boolean", "NSCLIENT2", "false"
             buildConfigField "boolean", "G5UPLOADER", "false"
             buildConfigField "boolean", "PUMPCONTROL", "false"
         }
         pumpcontrol {
+            applicationId "info.nightscout.androidaps"
             dimension "standard"
             resValue "string", "app_name", "AndroidAPS"
             versionName version
@@ -118,11 +120,13 @@ android {
             ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "true"
-            buildConfigField "boolean", "NSCLIENTOLNY", "false"
+            buildConfigField "boolean", "NSCLIENT", "false"
+            buildConfigField "boolean", "NSCLIENT2", "false"
             buildConfigField "boolean", "G5UPLOADER", "false"
             buildConfigField "boolean", "PUMPCONTROL", "true"
         }
         nsclient {
+            applicationId "info.nightscout.nsclient"
             dimension "standard"
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
@@ -132,11 +136,29 @@ android {
             ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "false"
-            buildConfigField "boolean", "NSCLIENTOLNY", "true"
+            buildConfigField "boolean", "NSCLIENT", "true"
+            buildConfigField "boolean", "NSCLIENT2", "false"
+            buildConfigField "boolean", "G5UPLOADER", "false"
+            buildConfigField "boolean", "PUMPCONTROL", "false"
+        }
+        nsclient2 {
+            applicationId "info.nightscout.nsclient2"
+            dimension "standard"
+            resValue "string", "app_name", "NSClient2"
+            versionName version + "-nsclient"
+            manifestPlaceholders = [
+                    appIcon: "@mipmap/yellowowl",
+                    appIconRound: "@null"
+            ]
+            buildConfigField "boolean", "APS", "false"
+            buildConfigField "boolean", "PUMPDRIVERS", "false"
+            buildConfigField "boolean", "NSCLIENT", "false"
+            buildConfigField "boolean", "NSCLIENT2", "true"
             buildConfigField "boolean", "G5UPLOADER", "false"
             buildConfigField "boolean", "PUMPCONTROL", "false"
         }
         g5uploader {
+            applicationId "info.nightscout.nsclient"
             dimension "standard"
             resValue "string", "app_name", "NSClient"
             versionName version + "-nsclient"
@@ -146,7 +168,8 @@ android {
             ]
             buildConfigField "boolean", "APS", "false"
             buildConfigField "boolean", "PUMPDRIVERS", "false"
-            buildConfigField "boolean", "NSCLIENTOLNY", "false"
+            buildConfigField "boolean", "NSCLIENT", "false"
+            buildConfigField "boolean", "NSCLIENT2", "false"
             buildConfigField "boolean", "G5UPLOADER", "true"
             buildConfigField "boolean", "PUMPCONTROL", "false"
         }

app/src/main/AndroidManifest.xml

@@ -129,7 +129,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="info.nightscout.androidaps.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/java/info/nightscout/androidaps/Config.java

@@ -9,18 +9,18 @@ public class Config {
     // MAIN FUCTIONALITY
     public static final boolean APS = BuildConfig.APS;
     // PLUGINS
-    public static final boolean NSCLIENT = BuildConfig.NSCLIENTOLNY;
+    public static final boolean NSCLIENT = BuildConfig.NSCLIENT || BuildConfig.NSCLIENT2;
     public static final boolean G5UPLOADER = BuildConfig.G5UPLOADER;
     public static final boolean PUMPCONTROL = BuildConfig.PUMPCONTROL;
 
-    public static final boolean HWPUMPS = BuildConfig.PUMPDRIVERS;
+    public static final boolean PUMPDRIVERS = BuildConfig.PUMPDRIVERS;
 
-    public static final boolean ACTION = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
+    public static final boolean ACTION = !NSCLIENT && !G5UPLOADER;
-    public static final boolean MDI = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
+    public static final boolean MDI = !NSCLIENT && !G5UPLOADER;
-    public static final boolean OTHERPROFILES = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
+    public static final boolean OTHERPROFILES = !NSCLIENT && !G5UPLOADER;
-    public static final boolean SAFETY = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
+    public static final boolean SAFETY = !NSCLIENT && !G5UPLOADER;
 
-    public static final boolean SMSCOMMUNICATORENABLED = !BuildConfig.NSCLIENTOLNY && !BuildConfig.G5UPLOADER;
+    public static final boolean SMSCOMMUNICATORENABLED = !NSCLIENT && !G5UPLOADER;
 
 
 }

app/src/main/java/info/nightscout/androidaps/MainActivity.java

@@ -146,7 +146,7 @@ public class MainActivity extends AppCompatActivity {
 
         AndroidPermission.notifyForStoragePermission(this);
         AndroidPermission.notifyForBatteryOptimizationPermission(this);
-        if (BuildConfig.APS || BuildConfig.PUMPCONTROL) {
+        if (Config.PUMPDRIVERS) {
             AndroidPermission.notifyForLocationPermissions(this);
             AndroidPermission.notifyForSMSPermissions(this);
         }
@@ -196,7 +196,7 @@ public class MainActivity extends AppCompatActivity {
                 }
             }
 
-            boolean keepScreenOn = BuildConfig.NSCLIENTOLNY && SP.getBoolean(R.string.key_keep_screen_on, false);
+            boolean keepScreenOn = Config.NSCLIENT && SP.getBoolean(R.string.key_keep_screen_on, false);
             if (keepScreenOn)
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             else

app/src/main/java/info/nightscout/androidaps/MainApp.java

@@ -152,14 +152,14 @@ public class MainApp extends Application {
             pluginsList.add(SensitivityAAPSPlugin.getPlugin());
             pluginsList.add(SensitivityWeightedAveragePlugin.getPlugin());
             pluginsList.add(SensitivityOref1Plugin.getPlugin());
-            if (Config.HWPUMPS) pluginsList.add(DanaRPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRPlugin.getPlugin());
-            if (Config.HWPUMPS) pluginsList.add(DanaRKoreanPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRKoreanPlugin.getPlugin());
-            if (Config.HWPUMPS) pluginsList.add(DanaRv2Plugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRv2Plugin.getPlugin());
-            if (Config.HWPUMPS) pluginsList.add(DanaRSPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(DanaRSPlugin.getPlugin());
             pluginsList.add(CareportalPlugin.getPlugin());
-            if (Config.HWPUMPS && engineeringMode)
+            if (Config.PUMPDRIVERS && engineeringMode)
                 pluginsList.add(InsightPlugin.getPlugin()); // <-- Enable Insight plugin here
-            if (Config.HWPUMPS) pluginsList.add(ComboPlugin.getPlugin());
+            if (Config.PUMPDRIVERS) pluginsList.add(ComboPlugin.getPlugin());
             if (Config.MDI) pluginsList.add(MDIPlugin.getPlugin());
             pluginsList.add(VirtualPumpPlugin.getPlugin());
             if (Config.APS) pluginsList.add(LoopPlugin.getPlugin());
@@ -382,7 +382,7 @@ public class MainApp extends Application {
     }
 
     public static boolean isEngineeringModeOrRelease() {
-        if (!BuildConfig.APS)
+        if (!Config.APS)
             return true;
         return engineeringMode || !devBranch;
     }

app/src/main/java/info/nightscout/androidaps/activities/PreferencesActivity.java

@@ -158,7 +158,7 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 addPreferencesFromResourceIfEnabled(SensitivityOref0Plugin.getPlugin(), PluginType.SENSITIVITY);
                 addPreferencesFromResourceIfEnabled(SensitivityOref1Plugin.getPlugin(), PluginType.SENSITIVITY);
 
-                if (Config.HWPUMPS) {
+                if (Config.PUMPDRIVERS) {
                     addPreferencesFromResourceIfEnabled(DanaRPlugin.getPlugin(), PluginType.PUMP);
                     addPreferencesFromResourceIfEnabled(DanaRKoreanPlugin.getPlugin(), PluginType.PUMP);
                     addPreferencesFromResourceIfEnabled(DanaRv2Plugin.getPlugin(), PluginType.PUMP);

app/src/main/java/info/nightscout/androidaps/plugins/Maintenance/MaintenancePlugin.java

@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PluginDescription;
@@ -80,7 +81,7 @@ public class MaintenancePlugin extends PluginBase {
         LOG.debug("zipFile: {}", zipFile.getAbsolutePath());
         File zip = this.zipLogs(zipFile, logs);
 
-        Uri attachementUri = FileProvider.getUriForFile(this.ctx, "info.nightscout.androidaps.fileprovider", zip);
+        Uri attachementUri = FileProvider.getUriForFile(this.ctx, BuildConfig.APPLICATION_ID + ".provider", zip);
         Intent emailIntent = this.sendMail(attachementUri, recipient, "Log Export");
         LOG.debug("sending emailIntent");
         ctx.startActivity(emailIntent);

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java

@@ -26,13 +26,13 @@ import info.nightscout.androidaps.interfaces.PumpDescription;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
+import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.androidaps.plugins.Overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress;
 import info.nightscout.androidaps.plugins.Overview.notifications.Notification;
 import info.nightscout.androidaps.plugins.PumpVirtual.events.EventVirtualPumpUpdateGui;
 import info.nightscout.androidaps.plugins.Treatments.TreatmentsPlugin;
 import info.nightscout.utils.DateUtil;
-import info.nightscout.androidaps.plugins.NSClientInternal.NSUpload;
 import info.nightscout.utils.SP;
 
 /**
@@ -79,7 +79,7 @@ public class VirtualPumpPlugin extends PluginBase implements PumpInterface {
                 .pluginName(R.string.virtualpump)
                 .shortName(R.string.virtualpump_shortname)
                 .preferencesId(R.xml.pref_virtualpump)
-                .neverVisible(BuildConfig.NSCLIENTOLNY || BuildConfig.G5UPLOADER)
+                .neverVisible(Config.NSCLIENT || Config.G5UPLOADER)
                 .description(R.string.description_pump_virtual)
         );
         pumpDescription.isBolusCapable = true;

app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.java

@@ -13,11 +13,10 @@ import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.List;
 
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.activities.PreferencesActivity;
 import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.activities.PreferencesActivity;
 import info.nightscout.androidaps.events.EventConfigBuilderChange;
 import info.nightscout.androidaps.events.EventPumpStatusChanged;
 import info.nightscout.androidaps.interfaces.PluginBase;
@@ -31,6 +30,7 @@ import info.nightscout.androidaps.plugins.ConfigBuilder.ProfileFunctions;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesFragment;
 import info.nightscout.androidaps.plugins.ConstraintsObjectives.ObjectivesPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.Maintenance.ImportExportPrefs;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientStatus;
 import info.nightscout.androidaps.plugins.ProfileLocal.LocalProfileFragment;
@@ -41,17 +41,16 @@ import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfileFragment;
 import info.nightscout.androidaps.plugins.ProfileSimple.SimpleProfilePlugin;
 import info.nightscout.androidaps.setupwizard.elements.SWBreak;
 import info.nightscout.androidaps.setupwizard.elements.SWButton;
+import info.nightscout.androidaps.setupwizard.elements.SWEditString;
+import info.nightscout.androidaps.setupwizard.elements.SWEditUrl;
 import info.nightscout.androidaps.setupwizard.elements.SWFragment;
 import info.nightscout.androidaps.setupwizard.elements.SWHtmlLink;
 import info.nightscout.androidaps.setupwizard.elements.SWInfotext;
 import info.nightscout.androidaps.setupwizard.elements.SWPlugin;
 import info.nightscout.androidaps.setupwizard.elements.SWRadioButton;
-import info.nightscout.androidaps.setupwizard.elements.SWEditString;
-import info.nightscout.androidaps.setupwizard.elements.SWEditUrl;
 import info.nightscout.androidaps.setupwizard.events.EventSWLabel;
 import info.nightscout.androidaps.setupwizard.events.EventSWUpdate;
 import info.nightscout.utils.AndroidPermission;
-import info.nightscout.androidaps.plugins.Maintenance.ImportExportPrefs;
 import info.nightscout.utils.LocaleHelper;
 import info.nightscout.utils.PasswordProtection;
 import info.nightscout.utils.SP;
@@ -83,9 +82,9 @@ public class SWDefinition {
     }
 
     SWDefinition() {
-        if (BuildConfig.FLAVOR.equals("full") || BuildConfig.FLAVOR.equals("pumpcontrol"))
+        if (Config.APS || Config.PUMPCONTROL)
             SWDefinitionFull();
-        else if (BuildConfig.FLAVOR.equals("nsclient"))
+        else if (Config.NSCLIENT)
             SWDefinitionNSClient();
     }
 

app/src/main/res/xml/pref_maintenance.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    xmlns:validatingEditText="http://schemas.android.com/apk/res/info.nightscout.androidaps">
 
     <PreferenceCategory
         android:key="maintenance"
@@ -12,10 +11,13 @@
             android:inputType="textEmailAddress"
             android:key="@string/key_maintenance_logs_email"
             android:selectAllOnFocus="true"
-            android:title="@string/maintenance_email"
+            android:title="@string/maintenance_email" />
-            validatingEditText:emptyAllowed="false"
+
-            validatingEditText:testErrorString="@string/invalid_email_message"
+        <!-- TODO: make this working with changed package name(nsclient)
-            validatingEditText:testType="email"/>
+        validatingEditText:emptyAllowed="false"
+        validatingEditText:testErrorString="@string/invalid_email_message"
+        validatingEditText:testType="email"
+        -->
 
         <EditTextPreference
             android:defaultValue="2"

app/src/test/java/info/nightscout/MainAppTest.java

@@ -5,14 +5,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import info.nightscout.androidaps.BuildConfig;
 import info.nightscout.androidaps.Config;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.PluginType;
 import info.nightscout.androidaps.interfaces.PumpInterface;
-import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 import info.nightscout.androidaps.plugins.Maintenance.LoggerUtils;
+import info.nightscout.androidaps.plugins.Overview.OverviewPlugin;
 
 
 /**
@@ -122,7 +121,7 @@ public class MainAppTest {
 
     @Test
     public void isEngineeringModeOrReleaseTest() {
-        Assert.assertEquals(!BuildConfig.APS, mainApp.isEngineeringModeOrRelease());
+        Assert.assertEquals(!Config.APS, mainApp.isEngineeringModeOrRelease());
     }
 
     @Test