Merge remote-tracking branch 'origin/dev' into combo-scripter-v2

* origin/dev:
  Fix format specifiers in Spanish translation, add MainApp.gs(id, args).
  travis accept license manually
  Push carbs only to pumps supporting storing carbs.
  travis to 27.0.2
  sdk27 & butterknife

.travis.yml

@@ -7,12 +7,15 @@ android:
   components:
   - platform-tools
   - tools
-  - build-tools-26.0.2
+  - build-tools-27.0.2
   - android-23
   - extra-google-m2repository
   - extra-android-m2repository
   - extra-google-google_play_services
   
+before_install:
+- yes | sdkmanager "platforms;android-27"
+
 script:
   # Unit Test
   - ./gradlew test jacocoTestReport

app/build.gradle

@@ -12,9 +12,10 @@ buildscript {
 apply plugin: "com.android.application"
 apply plugin: "io.fabric"
 apply plugin: "jacoco-android"
+apply plugin: 'com.jakewharton.butterknife'
 
 ext {
-    supportLibraryVersion = "23.4.0"
+    supportLibraryVersion = "27.0.2"
     ormLiteVersion = "4.46"
     powermockVersion = "1.7.3"
     dexmakerVersion = "1.2"
@@ -47,8 +48,8 @@ def generateGitBuild = { ->
 }
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 27
-    buildToolsVersion "26.0.2"
+    buildToolsVersion "${supportLibraryVersion}"
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
@@ -209,6 +210,9 @@ dependencies {
 
     compile "net.danlew:android.joda:2.9.9.1"
 
+    api "com.jakewharton:butterknife:8.8.1"
+    annotationProcessor "com.jakewharton:butterknife-compiler:8.8.1"
+
     testCompile "junit:junit:4.12"
     testCompile "org.json:json:20140107"
     testCompile "org.mockito:mockito-core:2.7.22"

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

@@ -235,6 +235,10 @@ public class MainApp extends Application {
         return sResources.getString(id);
     }
 
+    public static String gs(int id, Object... args) {
+        return sResources.getString(id, args);
+    }
+
     public static MainApp instance() {
         return sInstance;
     }

app/src/main/java/info/nightscout/androidaps/interfaces/PumpDescription.java

@@ -35,4 +35,6 @@ public class PumpDescription {
     public double basalMinimumRate = 0.04d;
 
     public boolean isRefillingCapable = false;
+
+    public boolean storesCarbInfo = true;
 }

app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java

@@ -6,7 +6,7 @@ import android.app.PendingIntent;
 import android.app.TaskStackBuilder;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import com.crashlytics.android.answers.Answers;
 import com.crashlytics.android.answers.CustomEvent;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java

@@ -158,19 +158,23 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                     detailedBolusInfo.carbs = finalCarbsAfterConstraints;
                                     detailedBolusInfo.context = context;
                                     detailedBolusInfo.source = Source.USER;
-                                    ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
-                                        @Override
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                        public void run() {
+                                            @Override
-                                            if (!result.success) {
+                                            public void run() {
-                                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                                if (!result.success) {
-                                                i.putExtra("soundid", R.raw.boluserror);
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                i.putExtra("status", result.comment);
+                                                    i.putExtra("soundid", R.raw.boluserror);
-                                                i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.putExtra("status", result.comment);
-                                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                MainApp.instance().startActivity(i);
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    MainApp.instance().startActivity(i);
+                                                }
                                             }
-                                        }
+                                        });
-                                    });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Bolus"));
                                 }
                             }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -365,19 +365,23 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                     detailedBolusInfo.carbTime = carbTime;
                                     detailedBolusInfo.boluscalc = boluscalcJSON;
                                     detailedBolusInfo.source = Source.USER;
-                                    ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
+                                    if (detailedBolusInfo.insulin > 0 || ConfigBuilderPlugin.getActivePump().getPumpDescription().storesCarbInfo) {
-                                        @Override
+                                        ConfigBuilderPlugin.getCommandQueue().bolus(detailedBolusInfo, new Callback() {
-                                        public void run() {
+                                            @Override
-                                            if (!result.success) {
+                                            public void run() {
-                                                Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
+                                                if (!result.success) {
-                                                i.putExtra("soundid", R.raw.boluserror);
+                                                    Intent i = new Intent(MainApp.instance(), ErrorHelperActivity.class);
-                                                i.putExtra("status", result.comment);
+                                                    i.putExtra("soundid", R.raw.boluserror);
-                                                i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
+                                                    i.putExtra("status", result.comment);
-                                                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    i.putExtra("title", MainApp.sResources.getString(R.string.treatmentdeliveryerror));
-                                                MainApp.instance().startActivity(i);
+                                                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                    MainApp.instance().startActivity(i);
+                                                }
                                             }
-                                        }
+                                        });
-                                    });
+                                    } else {
+                                        MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
+                                    }
                                     Answers.getInstance().logCustom(new CustomEvent("Wizard"));
                                 }
                             }

app/src/main/java/info/nightscout/androidaps/plugins/Persistentnotification/PersistentNotificationPlugin.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 
 import com.squareup.otto.Subscribe;
 

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java

@@ -110,6 +110,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -112,6 +112,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         pumpDescription.basalMinimumRate = 0.1d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/DanaRSPlugin.java

@@ -189,6 +189,8 @@ public class DanaRSPlugin implements PluginBase, PumpInterface, DanaRInterface,
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -109,6 +109,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         pumpDescription.basalMinimumRate = 0.04d;
 
         pumpDescription.isRefillingCapable = true;
+
+        pumpDescription.storesCarbInfo = true;
     }
 
     private ServiceConnection mConnection = new ServiceConnection() {

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

@@ -231,8 +231,8 @@
     <string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>
     <string formatted="false" name="smscommunicator_bolusreplywithcode">Para entregar bolo% .2fU responder con código% s</string>
     <string name="smscommunicator_bolusfailed">Bolo falló</string>
-    <string formatted="false" name="bolusdelivered">Bolo% .2fU entregado con éxito</string>
+    <string formatted="false" name="bolusdelivered">Bolo %.2fU entregado con éxito</string>
-    <string formatted="false" name="bolusdelivering">Entregando% .2fU</string>
+    <string formatted="false" name="bolusdelivering">Entregando %.2fU</string>
     <string name="smscommunicator_remotebolusnotallowed">Bolo remoto no permitido</string>
     <string name="glucosetype_finger">Dedo</string>
     <string name="glucosetype_sensor">Sensor</string>

build.gradle

@@ -10,13 +10,17 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+
+        classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        google()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }