Merge branch 'dev' into rs
This commit is contained in:
Milos Kozak
commit
0a63e1f29d
96 changed files with 809 additions and 833 deletions
|
|
@ -29,7 +29,7 @@ ext {
|
|||
powermockVersion = "1.7.3"
|
||||
dexmakerVersion = "1.2"
|
||||
retrofit2Version = '2.8.1'
|
||||
okhttp3Version = '4.5.0'
|
||||
okhttp3Version = '4.6.0'
|
||||
coroutinesVersion = '1.3.5'
|
||||
}
|
||||
|
||||
|
|
@ -160,6 +160,7 @@ android {
|
|||
}
|
||||
firebaseDisable {
|
||||
System.setProperty("disableFirebase", "true")
|
||||
ext.enableCrashlytics = false
|
||||
}
|
||||
}
|
||||
productFlavors {
|
||||
|
|
@ -242,12 +243,14 @@ allprojects {
|
|||
dependencies {
|
||||
wearApp project(':wear')
|
||||
|
||||
implementation project(':core')
|
||||
|
||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
|
||||
implementation "com.google.android.gms:play-services-location:17.0.0"
|
||||
implementation 'com.google.firebase:firebase-core:17.3.0'
|
||||
implementation 'com.google.firebase:firebase-auth:19.3.0'
|
||||
implementation 'com.google.firebase:firebase-database:19.2.1'
|
||||
implementation 'com.google.firebase:firebase-core:17.4.0'
|
||||
implementation 'com.google.firebase:firebase-auth:19.3.1'
|
||||
implementation 'com.google.firebase:firebase-database:19.3.0'
|
||||
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
|
||||
transitive = true;
|
||||
}
|
||||
|
|
@ -260,7 +263,7 @@ dependencies {
|
|||
implementation 'androidx.recyclerview:recyclerview:1.1.0'
|
||||
implementation 'androidx.gridlayout:gridlayout:1.0.0'
|
||||
implementation 'androidx.percentlayout:percentlayout:1.0.0'
|
||||
implementation "androidx.preference:preference-ktx:1.1.0"
|
||||
implementation "androidx.preference:preference-ktx:1.1.1"
|
||||
implementation 'com.google.android.material:material:1.1.0'
|
||||
implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
|
||||
|
||||
|
|
@ -271,7 +274,7 @@ dependencies {
|
|||
implementation("com.github.tony19:logback-android-classic:1.1.1-6") {
|
||||
exclude group: "com.google.android", module: "android"
|
||||
}
|
||||
implementation "org.apache.commons:commons-lang3:3.9"
|
||||
implementation 'org.apache.commons:commons-lang3:3.10'
|
||||
implementation 'org.slf4j:slf4j-api:1.7.30'
|
||||
// Graphview cannot be upgraded
|
||||
implementation "com.jjoe64:graphview:4.0.1"
|
||||
|
|
@ -288,28 +291,28 @@ dependencies {
|
|||
exclude group: "org.json", module: "json"
|
||||
}
|
||||
implementation "com.google.code.gson:gson:2.8.6"
|
||||
implementation ("com.google.guava:guava:24.1-jre") {
|
||||
implementation('com.google.guava:guava:29.0-jre') {
|
||||
exclude group: "com.google.code.findbugs", module: "jsr305"
|
||||
}
|
||||
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
||||
|
||||
implementation "net.danlew:android.joda:2.10.3"
|
||||
implementation 'net.danlew:android.joda:2.10.6'
|
||||
|
||||
implementation 'org.mozilla:rhino:1.7.11'
|
||||
implementation 'org.mozilla:rhino:1.7.12'
|
||||
|
||||
implementation 'com.github.DavidProdinger:weekdays-selector:1.1.0'
|
||||
|
||||
implementation 'com.github.kenglxn.QRGen:android:2.6.0'
|
||||
implementation 'com.eatthepath:java-otp:0.2.0'
|
||||
|
||||
testImplementation "junit:junit:4.12"
|
||||
testImplementation "junit:junit:4.13"
|
||||
testImplementation "org.json:json:20190722"
|
||||
testImplementation "org.mockito:mockito-core:2.8.47"
|
||||
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
|
||||
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
|
||||
testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
|
||||
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
|
||||
testImplementation "joda-time:joda-time:2.10.5"
|
||||
testImplementation 'joda-time:joda-time:2.10.6'
|
||||
testImplementation('com.google.truth:truth:1.0.1') {
|
||||
exclude group: "com.google.guava", module: "guava"
|
||||
exclude group: "com.google.code.findbugs", module: "jsr305"
|
||||
|
|
@ -330,24 +333,24 @@ dependencies {
|
|||
implementation "com.squareup.retrofit2:converter-gson:$retrofit2Version"
|
||||
|
||||
// Phone checker
|
||||
implementation 'com.scottyab:rootbeer-lib:0.0.7'
|
||||
implementation 'com.scottyab:rootbeer-lib:0.0.8'
|
||||
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-alpha03'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
||||
androidTestImplementation 'androidx.test:rules:1.3.0-alpha03'
|
||||
androidTestImplementation 'androidx.test:rules:1.3.0-beta01'
|
||||
androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.2'
|
||||
|
||||
/* Dagger2 - We are going to use dagger.android which includes
|
||||
* support for Activity and fragment injection so we need to include
|
||||
* the following dependencies */
|
||||
implementation 'com.google.dagger:dagger-android:2.25.2'
|
||||
implementation 'com.google.dagger:dagger-android-support:2.25.2'
|
||||
annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
|
||||
annotationProcessor 'com.google.dagger:dagger-android-processor:2.25.2'
|
||||
kapt 'com.google.dagger:dagger-android-processor:2.25.2'
|
||||
implementation "com.google.dagger:dagger-android:$dagger_version"
|
||||
implementation "com.google.dagger:dagger-android-support:$dagger_version"
|
||||
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
|
||||
annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
|
||||
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
|
||||
|
||||
/* Dagger2 - default dependency */
|
||||
kapt 'com.google.dagger:dagger-compiler:2.25.2'
|
||||
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
||||
|
||||
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ import info.nightscout.androidaps.logging.AAPSLogger
|
|||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
|
||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
|
||||
import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
|
||||
import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.data.NSSettingsStatus
|
||||
import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin
|
||||
|
|
@ -53,11 +55,13 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
|||
import info.nightscout.androidaps.utils.buildHelper.BuildHelper
|
||||
import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
|
||||
import info.nightscout.androidaps.utils.protection.ProtectionCheck
|
||||
import info.nightscout.androidaps.utils.resources.IconsProvider
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
import kotlin.system.exitProcess
|
||||
|
||||
|
|
@ -77,6 +81,9 @@ class MainActivity : NoSplashAppCompatActivity() {
|
|||
@Inject lateinit var activePlugin: ActivePluginProvider
|
||||
@Inject lateinit var fabricPrivacy: FabricPrivacy
|
||||
@Inject lateinit var protectionCheck: ProtectionCheck
|
||||
@Inject lateinit var iconsProvider: IconsProvider
|
||||
@Inject lateinit var constraintChecker: ConstraintChecker
|
||||
@Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
|
||||
|
||||
private lateinit var actionBarDrawerToggle: ActionBarDrawerToggle
|
||||
private var pluginPreferencesMenuItem: MenuItem? = null
|
||||
|
|
@ -107,7 +114,7 @@ class MainActivity : NoSplashAppCompatActivity() {
|
|||
|
||||
//Check here if loop plugin is disabled. Else check via constraints
|
||||
if (!loopPlugin.isEnabled(PluginType.LOOP)) versionCheckerUtils.triggerCheckVersion()
|
||||
fabricPrivacy.setUserStats()
|
||||
setUserStats()
|
||||
setupViews()
|
||||
disposable.add(rxBus
|
||||
.toObservable(EventRebuildTabs::class.java)
|
||||
|
|
@ -283,7 +290,7 @@ class MainActivity : NoSplashAppCompatActivity() {
|
|||
Linkify.addLinks(messageSpanned, Linkify.WEB_URLS)
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(resourceHelper.gs(R.string.app_name) + " " + BuildConfig.VERSION)
|
||||
.setIcon(resourceHelper.getIcon())
|
||||
.setIcon(iconsProvider.getIcon())
|
||||
.setMessage(messageSpanned)
|
||||
.setPositiveButton(resourceHelper.gs(R.string.ok), null)
|
||||
.create().also {
|
||||
|
|
@ -323,4 +330,35 @@ class MainActivity : NoSplashAppCompatActivity() {
|
|||
}
|
||||
return actionBarDrawerToggle.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
// Correct place for calling setUserStats() would be probably MainApp
|
||||
// but we need to have it called at least once a day. Thus this location
|
||||
|
||||
private fun setUserStats() {
|
||||
if (!fabricPrivacy.fabricEnabled()) return
|
||||
val closedLoopEnabled = if (constraintChecker.isClosedLoopAllowed().value()) "CLOSED_LOOP_ENABLED" else "CLOSED_LOOP_DISABLED"
|
||||
// Size is limited to 36 chars
|
||||
val remote = BuildConfig.REMOTE.toLowerCase(Locale.getDefault())
|
||||
.replace("https://", "")
|
||||
.replace("http://", "")
|
||||
.replace(".git", "")
|
||||
.replace(".com/", ":")
|
||||
.replace(".org/", ":")
|
||||
.replace(".net/", ":")
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("Mode", BuildConfig.APPLICATION_ID + "-" + closedLoopEnabled)
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("Language", sp.getString(R.string.key_language, Locale.getDefault().language))
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("Version", BuildConfig.VERSION)
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("HEAD", BuildConfig.HEAD)
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("Remote", remote)
|
||||
val hashes: List<String> = signatureVerifierPlugin.shortHashes()
|
||||
if (hashes.isNotEmpty()) fabricPrivacy.firebaseAnalytics.setUserProperty("Hash", hashes[0])
|
||||
activePlugin.activePump.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Pump", it::class.java.simpleName) }
|
||||
if (!Config.NSCLIENT && !Config.PUMPCONTROL)
|
||||
activePlugin.activeAPS.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Aps", it::class.java.simpleName) }
|
||||
activePlugin.activeBgSource.let { fabricPrivacy.firebaseAnalytics.setUserProperty("BgSource", it::class.java.simpleName) }
|
||||
fabricPrivacy.firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
|
||||
activePlugin.activeSensitivity.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Sensitivity", it::class.java.simpleName) }
|
||||
activePlugin.activeInsulin.let { fabricPrivacy.firebaseAnalytics.setUserProperty("Insulin", it::class.java.simpleName) }
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ import info.nightscout.androidaps.R;
|
|||
import info.nightscout.androidaps.data.Profile;
|
||||
import info.nightscout.androidaps.interfaces.Interval;
|
||||
import info.nightscout.androidaps.logging.AAPSLogger;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction;
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.data.NSMbg;
|
||||
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
|
||||
|
|
@ -156,8 +156,7 @@ public class CareportalEvent implements DataPointWithLabelInterface, Interval {
|
|||
for (int i = 0; i < list.size(); i++) {
|
||||
CareportalEvent event = list.get(i);
|
||||
if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
aapsLogger.debug("Found event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
aapsLogger.debug(LTag.DATABASE, "Found event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ import info.nightscout.androidaps.events.EventTempTargetChange;
|
|||
import info.nightscout.androidaps.interfaces.ActivePluginProvider;
|
||||
import info.nightscout.androidaps.interfaces.ProfileInterface;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus;
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
|
||||
|
|
@ -72,7 +73,7 @@ import info.nightscout.androidaps.utils.ToastUtils;
|
|||
* direct calls to the corresponding methods (eg. resetDatabases) should be done by a central service.
|
||||
*/
|
||||
public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
|
||||
|
||||
public static final String DATABASE_NAME = "AndroidAPSDb";
|
||||
public static final String DATABASE_BGREADINGS = "BgReadings";
|
||||
|
|
@ -123,7 +124,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
@Override
|
||||
public void onCreate(SQLiteDatabase database, ConnectionSource connectionSource) {
|
||||
try {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.info("onCreate");
|
||||
TableUtils.createTableIfNotExists(connectionSource, TempTarget.class);
|
||||
TableUtils.createTableIfNotExists(connectionSource, BgReading.class);
|
||||
|
|
@ -366,7 +367,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
public static long roundDateToSec(long date) {
|
||||
long rounded = date - date % 1000;
|
||||
if (rounded != date)
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Rounding " + date + " to " + rounded);
|
||||
return rounded;
|
||||
}
|
||||
|
|
@ -378,17 +379,17 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
BgReading old = getDaoBgReadings().queryForId(bgReading.date);
|
||||
if (old == null) {
|
||||
getDaoBgReadings().create(bgReading);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("BG: New record from: " + from + " " + bgReading.toString());
|
||||
scheduleBgChange(bgReading);
|
||||
return true;
|
||||
}
|
||||
if (!old.isEqual(bgReading)) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("BG: Similiar found: " + old.toString());
|
||||
old.copyFrom(bgReading);
|
||||
getDaoBgReadings().update(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("BG: Updating record from: " + from + " New data: " + old.toString());
|
||||
scheduleBgChange(bgReading);
|
||||
return false;
|
||||
|
|
@ -411,7 +412,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleBgChange(@Nullable final BgReading bgReading) {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing EventNewBg");
|
||||
RxBus.Companion.getINSTANCE().send(new EventNewBG(bgReading));
|
||||
scheduledBgPost = null;
|
||||
|
|
@ -640,7 +641,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoTempTargets().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(tempTarget);
|
||||
getDaoTempTargets().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPTARGET: Updating record by date from: " + Source.getString(tempTarget.source) + " " + old.toString());
|
||||
scheduleTemporaryTargetChange();
|
||||
return true;
|
||||
|
|
@ -660,7 +661,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoTempTargets().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(tempTarget);
|
||||
getDaoTempTargets().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPTARGET: Updating record by _id from: " + Source.getString(tempTarget.source) + " " + old.toString());
|
||||
scheduleTemporaryTargetChange();
|
||||
return true;
|
||||
|
|
@ -668,14 +669,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
}
|
||||
getDaoTempTargets().create(tempTarget);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
|
||||
scheduleTemporaryTargetChange();
|
||||
return true;
|
||||
}
|
||||
if (tempTarget.source == Source.USER) {
|
||||
getDaoTempTargets().create(tempTarget);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPTARGET: New record from: " + Source.getString(tempTarget.source) + " " + tempTarget.toString());
|
||||
scheduleTemporaryTargetChange();
|
||||
return true;
|
||||
|
|
@ -698,7 +699,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleTemporaryTargetChange() {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing EventTempTargetChange");
|
||||
RxBus.Companion.getINSTANCE().send(new EventTempTargetChange());
|
||||
scheduledTemTargetPost = null;
|
||||
|
|
@ -824,7 +825,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
List<TemporaryBasal> trList = getDaoTemporaryBasal().query(preparedQuery);
|
||||
if (trList.size() > 0) {
|
||||
// do nothing, pump history record cannot be changed
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: Already exists from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
|
||||
return false;
|
||||
}
|
||||
|
|
@ -842,7 +843,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
old.copyFromPump(tempBasal);
|
||||
old.source = Source.PUMP;
|
||||
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: Updated record with Pump Data : " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
|
||||
|
||||
getDaoTemporaryBasal().update(old);
|
||||
|
|
@ -854,7 +855,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
|
||||
getDaoTemporaryBasal().create(tempBasal);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
|
||||
updateEarliestDataChange(tempBasal.date);
|
||||
scheduleTemporaryBasalChange();
|
||||
|
|
@ -872,7 +873,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoTemporaryBasal().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(tempBasal);
|
||||
getDaoTemporaryBasal().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: Updating record by date from: " + Source.getString(tempBasal.source) + " " + old.toString());
|
||||
updateEarliestDataChange(oldDate);
|
||||
updateEarliestDataChange(old.date);
|
||||
|
|
@ -895,7 +896,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoTemporaryBasal().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(tempBasal);
|
||||
getDaoTemporaryBasal().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: Updating record by _id from: " + Source.getString(tempBasal.source) + " " + old.toString());
|
||||
updateEarliestDataChange(oldDate);
|
||||
updateEarliestDataChange(old.date);
|
||||
|
|
@ -905,7 +906,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
}
|
||||
getDaoTemporaryBasal().create(tempBasal);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
|
||||
updateEarliestDataChange(tempBasal.date);
|
||||
scheduleTemporaryBasalChange();
|
||||
|
|
@ -913,7 +914,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
if (tempBasal.source == Source.USER) {
|
||||
getDaoTemporaryBasal().create(tempBasal);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: New record from: " + Source.getString(tempBasal.source) + " " + tempBasal.toString());
|
||||
updateEarliestDataChange(tempBasal.date);
|
||||
scheduleTemporaryBasalChange();
|
||||
|
|
@ -970,7 +971,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleTemporaryBasalChange() {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing EventTempBasalChange");
|
||||
RxBus.Companion.getINSTANCE().send(new EventReloadTempBasalData());
|
||||
RxBus.Companion.getINSTANCE().send(new EventTempBasalChange());
|
||||
|
|
@ -1065,7 +1066,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
public void deleteTempBasalById(String _id) {
|
||||
TemporaryBasal stored = findTempBasalById(_id);
|
||||
if (stored != null) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("TEMPBASAL: Removing TempBasal record from database: " + stored.toString());
|
||||
delete(stored);
|
||||
updateEarliestDataChange(stored.date);
|
||||
|
|
@ -1120,7 +1121,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
|
||||
public boolean createOrUpdate(ExtendedBolus extendedBolus) {
|
||||
try {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: createOrUpdate: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
|
||||
|
||||
ExtendedBolus old;
|
||||
|
|
@ -1145,7 +1146,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
getDaoExtendedBolus().createOrUpdate(extendedBolus);
|
||||
}
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
|
||||
updateEarliestDataChange(extendedBolus.date);
|
||||
scheduleExtendedBolusChange();
|
||||
|
|
@ -1159,7 +1160,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoExtendedBolus().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(extendedBolus);
|
||||
getDaoExtendedBolus().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: Updating record by date from: " + Source.getString(extendedBolus.source) + " " + old.log());
|
||||
updateEarliestDataChange(oldDate);
|
||||
updateEarliestDataChange(old.date);
|
||||
|
|
@ -1182,7 +1183,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoExtendedBolus().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(extendedBolus);
|
||||
getDaoExtendedBolus().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: Updating record by _id from: " + Source.getString(extendedBolus.source) + " " + old.log());
|
||||
updateEarliestDataChange(oldDate);
|
||||
updateEarliestDataChange(old.date);
|
||||
|
|
@ -1192,7 +1193,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
}
|
||||
getDaoExtendedBolus().create(extendedBolus);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
|
||||
updateEarliestDataChange(extendedBolus.date);
|
||||
scheduleExtendedBolusChange();
|
||||
|
|
@ -1200,7 +1201,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
}
|
||||
if (extendedBolus.source == Source.USER) {
|
||||
getDaoExtendedBolus().create(extendedBolus);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: New record from: " + Source.getString(extendedBolus.source) + " " + extendedBolus.log());
|
||||
updateEarliestDataChange(extendedBolus.date);
|
||||
scheduleExtendedBolusChange();
|
||||
|
|
@ -1249,10 +1250,26 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
return new ArrayList<ExtendedBolus>();
|
||||
}
|
||||
|
||||
public List<ExtendedBolus> getExtendedBolusDataFromTime(long from, long to, boolean ascending) {
|
||||
try {
|
||||
List<ExtendedBolus> extendedBoluses;
|
||||
QueryBuilder<ExtendedBolus, Long> queryBuilder = getDaoExtendedBolus().queryBuilder();
|
||||
queryBuilder.orderBy("date", ascending);
|
||||
Where where = queryBuilder.where();
|
||||
where.between("date", from, to);
|
||||
PreparedQuery<ExtendedBolus> preparedQuery = queryBuilder.prepare();
|
||||
extendedBoluses = getDaoExtendedBolus().query(preparedQuery);
|
||||
return extendedBoluses;
|
||||
} catch (SQLException e) {
|
||||
log.error("Unhandled exception", e);
|
||||
}
|
||||
return new ArrayList<ExtendedBolus>();
|
||||
}
|
||||
|
||||
public void deleteExtendedBolusById(String _id) {
|
||||
ExtendedBolus stored = findExtendedBolusById(_id);
|
||||
if (stored != null) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("EXTENDEDBOLUS: Removing ExtendedBolus record from database: " + stored.toString());
|
||||
delete(stored);
|
||||
updateEarliestDataChange(stored.date);
|
||||
|
|
@ -1306,7 +1323,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleExtendedBolusChange() {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing EventExtendedBolusChange");
|
||||
RxBus.Companion.getINSTANCE().send(new EventReloadTreatmentData(new EventExtendedBolusChange()));
|
||||
if (earliestDataChange != null)
|
||||
|
|
@ -1468,11 +1485,11 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
|
||||
if (list.size() == 1) {
|
||||
CareportalEvent record = list.get(0);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Removing CareportalEvent record from database: " + record.toString());
|
||||
delete(record);
|
||||
} else {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("CareportalEvent not found database: " + _id);
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
|
|
@ -1492,12 +1509,12 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
if (list.size() == 0) {
|
||||
careportalEvent = new CareportalEvent(MainApp.instance());
|
||||
careportalEvent.source = Source.NIGHTSCOUT;
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Adding CareportalEvent record to database: " + trJson.toString());
|
||||
// Record does not exists. add
|
||||
} else if (list.size() == 1) {
|
||||
careportalEvent = list.get(0);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Updating CareportalEvent record in database: " + trJson.toString());
|
||||
} else {
|
||||
log.error("Something went wrong");
|
||||
|
|
@ -1516,7 +1533,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleCareportalEventChange() {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing scheduleCareportalEventChange");
|
||||
RxBus.Companion.getINSTANCE().send(new EventCareportalEventChange());
|
||||
scheduledCareportalEventPost = null;
|
||||
|
|
@ -1629,7 +1646,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
profileSwitch.profileName = old.profileName; // preserver profileName to prevent multiple CPP extension
|
||||
getDaoProfileSwitch().delete(old); // need to delete/create because date may change too
|
||||
getDaoProfileSwitch().create(profileSwitch);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("PROFILESWITCH: Updating record by date from: " + Source.getString(profileSwitch.source) + " " + old.toString());
|
||||
scheduleProfileSwitchChange();
|
||||
return true;
|
||||
|
|
@ -1649,7 +1666,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
getDaoProfileSwitch().delete(old); // need to delete/create because date may change too
|
||||
old.copyFrom(profileSwitch);
|
||||
getDaoProfileSwitch().create(old);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("PROFILESWITCH: Updating record by _id from: " + Source.getString(profileSwitch.source) + " " + old.toString());
|
||||
scheduleProfileSwitchChange();
|
||||
return true;
|
||||
|
|
@ -1659,14 +1676,14 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
// look for already added percentage from NS
|
||||
profileSwitch.profileName = PercentageSplitter.pureName(profileSwitch.profileName);
|
||||
getDaoProfileSwitch().create(profileSwitch);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
|
||||
scheduleProfileSwitchChange();
|
||||
return true;
|
||||
}
|
||||
if (profileSwitch.source == Source.USER) {
|
||||
getDaoProfileSwitch().create(profileSwitch);
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("PROFILESWITCH: New record from: " + Source.getString(profileSwitch.source) + " " + profileSwitch.toString());
|
||||
scheduleProfileSwitchChange();
|
||||
return true;
|
||||
|
|
@ -1689,7 +1706,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
private static void scheduleProfileSwitchChange() {
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Firing EventProfileNeedsUpdate");
|
||||
RxBus.Companion.getINSTANCE().send(new EventReloadProfileSwitchData());
|
||||
RxBus.Companion.getINSTANCE().send(new EventProfileNeedsUpdate());
|
||||
|
|
@ -1741,17 +1758,17 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
Profile profile = store.getSpecificProfile(profileSwitch.profileName);
|
||||
if (profile != null) {
|
||||
profileSwitch.profileJson = profile.getData().toString();
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Profile switch prefilled with JSON from local store");
|
||||
// Update data in NS
|
||||
NSUpload.updateProfileSwitch(profileSwitch);
|
||||
} else {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("JSON for profile switch doesn't exist. Ignoring: " + trJson.toString());
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("Store for profile switch doesn't exist. Ignoring: " + trJson.toString());
|
||||
return;
|
||||
}
|
||||
|
|
@ -1767,7 +1784,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
|
|||
public void deleteProfileSwitchById(String _id) {
|
||||
ProfileSwitch stored = findProfileSwitchById(_id);
|
||||
if (stored != null) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
if (L.isEnabled(LTag.DATABASE))
|
||||
log.debug("PROFILESWITCH: Removing ProfileSwitch record from database: " + stored.toString());
|
||||
delete(stored);
|
||||
scheduleTemporaryTargetChange();
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
package info.nightscout.androidaps.db;
|
||||
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.hash.Hashing;
|
||||
import com.j256.ormlite.field.DatabaseField;
|
||||
import com.j256.ormlite.table.DatabaseTable;
|
||||
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.utils.DateUtil;
|
||||
|
||||
|
|
@ -21,7 +18,7 @@ import info.nightscout.androidaps.utils.DateUtil;
|
|||
*/
|
||||
@DatabaseTable(tableName = DatabaseHelper.DATABASE_DBREQUESTS)
|
||||
public class DbRequest {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
|
||||
|
||||
@DatabaseField(id = true)
|
||||
public String nsClientID = null;
|
||||
|
|
@ -88,9 +85,9 @@ public class DbRequest {
|
|||
public String log() {
|
||||
return
|
||||
"\nnsClientID:" + nsClientID +
|
||||
"\naction:" + action +
|
||||
"\ncollection:" + collection +
|
||||
"\ndata:" + data +
|
||||
"\n_id:" + _id;
|
||||
"\naction:" + action +
|
||||
"\ncollection:" + collection +
|
||||
"\ndata:" + data +
|
||||
"\n_id:" + _id;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import info.nightscout.androidaps.data.Profile;
|
|||
import info.nightscout.androidaps.interfaces.Interval;
|
||||
import info.nightscout.androidaps.logging.AAPSLogger;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
|
||||
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
|
||||
import info.nightscout.androidaps.plugins.general.overview.graphExtensions.DataPointWithLabelInterface;
|
||||
|
|
@ -253,13 +254,11 @@ public class ProfileSwitch implements Interval, DataPointWithLabelInterface {
|
|||
if (event.date <= time && event.date > (time - T.mins(5).msecs())) {
|
||||
if (zeroDurationOnly) {
|
||||
if (event.durationInMinutes == 0) {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
aapsLogger.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
if (L.isEnabled(L.DATABASE))
|
||||
aapsLogger.debug("Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
aapsLogger.debug(LTag.DATABASE, "Found ProfileSwitch event for time: " + DateUtil.dateAndTimeString(time) + " " + event.toString());
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ import info.nightscout.androidaps.R;
|
|||
import info.nightscout.androidaps.data.Profile;
|
||||
import info.nightscout.androidaps.interfaces.Interval;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.utils.DateUtil;
|
||||
import info.nightscout.androidaps.utils.DecimalFormatter;
|
||||
|
|
@ -21,7 +22,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper;
|
|||
|
||||
@DatabaseTable(tableName = DatabaseHelper.DATABASE_TEMPTARGETS)
|
||||
public class TempTarget implements Interval {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.DATABASE);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATABASE);
|
||||
|
||||
@DatabaseField(id = true)
|
||||
public long date;
|
||||
|
|
|
|||
|
|
@ -110,6 +110,8 @@ public class TemporaryBasal implements Interval, DbObjectBase {
|
|||
}
|
||||
|
||||
public TemporaryBasal(ExtendedBolus extendedBolus) {
|
||||
injector = MainApp.instance();
|
||||
injector.androidInjector().inject(this);
|
||||
double basal = profileFunction.getProfile(extendedBolus.date).getBasal(extendedBolus.date);
|
||||
this.date = extendedBolus.date;
|
||||
this.isValid = extendedBolus.isValid;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import dagger.Component
|
|||
import dagger.android.AndroidInjectionModule
|
||||
import dagger.android.AndroidInjector
|
||||
import info.nightscout.androidaps.MainApp
|
||||
import info.nightscout.androidaps.core.dependencyInjection.CoreModule
|
||||
import info.nightscout.androidaps.data.Profile
|
||||
import info.nightscout.androidaps.data.ProfileStore
|
||||
import info.nightscout.androidaps.data.PumpEnactResult
|
||||
|
|
@ -53,6 +54,7 @@ import javax.inject.Singleton
|
|||
@Component(
|
||||
modules = [
|
||||
AndroidInjectionModule::class,
|
||||
CoreModule::class,
|
||||
ActivitiesModule::class,
|
||||
FragmentsModule::class,
|
||||
AppModule::class,
|
||||
|
|
|
|||
|
|
@ -1,112 +1,37 @@
|
|||
package info.nightscout.androidaps.dependencyInjection
|
||||
|
||||
import android.content.Context
|
||||
import androidx.preference.PreferenceManager
|
||||
import dagger.Binds
|
||||
import dagger.Lazy
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import dagger.android.ContributesAndroidInjector
|
||||
import dagger.android.HasAndroidInjector
|
||||
import info.nightscout.androidaps.Config
|
||||
import info.nightscout.androidaps.MainApp
|
||||
import info.nightscout.androidaps.data.Profile
|
||||
import info.nightscout.androidaps.data.ProfileStore
|
||||
import info.nightscout.androidaps.data.PumpEnactResult
|
||||
import info.nightscout.androidaps.db.BgReading
|
||||
import info.nightscout.androidaps.db.CareportalEvent
|
||||
import info.nightscout.androidaps.db.ProfileSwitch
|
||||
import info.nightscout.androidaps.db.TemporaryBasal
|
||||
import info.nightscout.androidaps.interfaces.ActivePluginProvider
|
||||
import info.nightscout.androidaps.interfaces.CommandQueueProvider
|
||||
import info.nightscout.androidaps.interfaces.PluginBase
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.AAPSLoggerProduction
|
||||
import info.nightscout.androidaps.plugins.aps.loop.APSResult
|
||||
import info.nightscout.androidaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
|
||||
import info.nightscout.androidaps.plugins.aps.logger.LoggerCallback
|
||||
import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
|
||||
import info.nightscout.androidaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
|
||||
import info.nightscout.androidaps.plugins.configBuilder.PluginStore
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunction
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ProfileFunctionImplementation
|
||||
import info.nightscout.androidaps.plugins.constraints.objectives.objectives.*
|
||||
import info.nightscout.androidaps.plugins.general.automation.AutomationEvent
|
||||
import info.nightscout.androidaps.plugins.general.automation.actions.*
|
||||
import info.nightscout.androidaps.plugins.general.automation.elements.*
|
||||
import info.nightscout.androidaps.plugins.general.automation.triggers.*
|
||||
import info.nightscout.androidaps.plugins.general.overview.graphData.GraphData
|
||||
import info.nightscout.androidaps.plugins.general.maintenance.ImportExportPrefs
|
||||
import info.nightscout.androidaps.plugins.general.maintenance.formats.ClassicPrefsFormat
|
||||
import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
|
||||
import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationWithAction
|
||||
import info.nightscout.androidaps.plugins.general.smsCommunicator.AuthRequest
|
||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensData
|
||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatus
|
||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobOref1Thread
|
||||
import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobThread
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCommunicationManager
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SendAndListen
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.command.SetPreamble
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioPacket
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RadioResponse
|
||||
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.*
|
||||
import info.nightscout.androidaps.plugins.pump.medtronic.comm.MedtronicCommunicationManager
|
||||
import info.nightscout.androidaps.plugins.pump.medtronic.comm.ui.MedtronicUITask
|
||||
import info.nightscout.androidaps.plugins.treatments.Treatment
|
||||
import info.nightscout.androidaps.queue.CommandQueue
|
||||
import info.nightscout.androidaps.queue.commands.*
|
||||
import info.nightscout.androidaps.setupwizard.SWEventListener
|
||||
import info.nightscout.androidaps.setupwizard.SWScreen
|
||||
import info.nightscout.androidaps.setupwizard.elements.*
|
||||
import info.nightscout.androidaps.utils.CryptoUtil
|
||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelperImplementation
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SPImplementation
|
||||
import info.nightscout.androidaps.utils.storage.FileStorage
|
||||
import info.nightscout.androidaps.utils.storage.Storage
|
||||
import info.nightscout.androidaps.utils.wizard.BolusWizard
|
||||
import info.nightscout.androidaps.utils.wizard.QuickWizardEntry
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Module(includes = [AppModule.AppBindings::class, PluginsModule::class])
|
||||
open class AppModule {
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideSharedPreferences(context: Context, resourceHelper: ResourceHelper): SP {
|
||||
return SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), resourceHelper)
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideProfileFunction(injector: HasAndroidInjector, aapsLogger: AAPSLogger, sp: SP, resourceHelper: ResourceHelper, activePlugin: ActivePluginProvider, fabricPrivacy: FabricPrivacy): ProfileFunction {
|
||||
return ProfileFunctionImplementation(injector, aapsLogger, sp, resourceHelper, activePlugin, fabricPrivacy)
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideResources(mainApp: MainApp): ResourceHelper {
|
||||
return ResourceHelperImplementation(mainApp)
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideAAPSLogger(): AAPSLogger {
|
||||
return AAPSLoggerProduction()
|
||||
/* if (BuildConfig.DEBUG) {
|
||||
AAPSLoggerDebug()
|
||||
} else {
|
||||
AAPSLoggerProduction()
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
@Provides
|
||||
fun providesPlugins(@PluginsModule.AllConfigs allConfigs: Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>,
|
||||
@PluginsModule.PumpDriver pumpDrivers: Lazy<Map<@JvmSuppressWildcards Int, @JvmSuppressWildcards PluginBase>>,
|
||||
|
|
@ -133,10 +58,7 @@ open class AppModule {
|
|||
|
||||
@Binds fun bindContext(mainApp: MainApp): Context
|
||||
@Binds fun bindInjector(mainApp: MainApp): HasAndroidInjector
|
||||
|
||||
@Binds
|
||||
fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
|
||||
|
||||
@Binds fun bindActivePluginProvider(pluginStore: PluginStore): ActivePluginProvider
|
||||
@Binds fun commandQueueProvider(commandQueue: CommandQueue): CommandQueueProvider
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
package info.nightscout.androidaps.logging
|
||||
|
||||
import android.util.Log
|
||||
|
||||
/**
|
||||
* Created by adrian on 2019-12-27.
|
||||
*/
|
||||
|
||||
class AAPSLoggerDebug : AAPSLogger {
|
||||
|
||||
override fun debug(message: String) {
|
||||
Log.d(LTag.CORE.tag, message)
|
||||
}
|
||||
|
||||
override fun debug(enable: Boolean, tag: LTag, message: String) {
|
||||
if (enable) Log.d(LTag.CORE.tag, message)
|
||||
}
|
||||
|
||||
override fun debug(tag: LTag, message: String) {
|
||||
Log.d(tag.tag, message)
|
||||
}
|
||||
|
||||
override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
Log.d(tag.tag, String.format(format, arguments))
|
||||
}
|
||||
|
||||
override fun warn(tag: LTag, message: String) {
|
||||
Log.w(tag.tag, message)
|
||||
}
|
||||
|
||||
override fun warn(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
Log.w(tag.tag, String.format(format, arguments))
|
||||
}
|
||||
|
||||
override fun info(tag: LTag, message: String) {
|
||||
Log.i(tag.tag, message)
|
||||
}
|
||||
|
||||
override fun info(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
Log.i(tag.tag, String.format(format, arguments))
|
||||
}
|
||||
|
||||
override fun error(tag: LTag, message: String) {
|
||||
Log.e(tag.tag, message)
|
||||
|
||||
}
|
||||
|
||||
override fun error(message: String) {
|
||||
Log.e(LTag.CORE.tag, message)
|
||||
}
|
||||
|
||||
override fun error(message: String, throwable: Throwable) {
|
||||
Log.e(LTag.CORE.tag, message, throwable)
|
||||
}
|
||||
|
||||
override fun error(format: String, vararg arguments: Any?) {
|
||||
Log.e(LTag.CORE.tag, String.format(format, arguments))
|
||||
}
|
||||
|
||||
override fun error(tag: LTag, message: String, throwable: Throwable) {
|
||||
Log.e(tag.tag, message, throwable)
|
||||
|
||||
}
|
||||
|
||||
override fun error(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
Log.e(tag.tag, String.format(format, arguments))
|
||||
}
|
||||
}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
package info.nightscout.androidaps.logging
|
||||
|
||||
import androidx.preference.PreferenceManager
|
||||
import info.nightscout.androidaps.MainApp
|
||||
import java.util.*
|
||||
|
||||
object L {
|
||||
private var logElements: MutableList<LogElement> = ArrayList()
|
||||
|
||||
const val CORE = "CORE"
|
||||
const val BGSOURCE = "BGSOURCE"
|
||||
const val DATASERVICE = "DATASERVICE"
|
||||
const val DATABASE = "DATABASE"
|
||||
const val DATAFOOD = "DATAFOOD"
|
||||
const val DATATREATMENTS = "DATATREATMENTS"
|
||||
const val NSCLIENT = "NSCLIENT"
|
||||
const val PUMP = "PUMP"
|
||||
const val PUMPCOMM = "PUMPCOMM"
|
||||
const val PUMPBTCOMM = "PUMPBTCOMM"
|
||||
|
||||
init {
|
||||
LTag.values().forEach { logElements.add(LogElement(it)) }
|
||||
}
|
||||
|
||||
private fun findByName(name: String): LogElement {
|
||||
for (element in logElements) {
|
||||
if (element.name == name) return element
|
||||
}
|
||||
return LogElement(false)
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun isEnabled(name: String): Boolean {
|
||||
return findByName(name).enabled
|
||||
}
|
||||
|
||||
fun getLogElements(): List<LogElement> {
|
||||
return logElements
|
||||
}
|
||||
|
||||
fun resetToDefaults() {
|
||||
for (element in logElements) {
|
||||
element.resetToDefault()
|
||||
}
|
||||
}
|
||||
|
||||
class LogElement {
|
||||
var name: String
|
||||
var defaultValue: Boolean
|
||||
var enabled: Boolean
|
||||
private var requiresRestart = false
|
||||
|
||||
internal constructor(tag: LTag) {
|
||||
this.name = tag.tag
|
||||
this.defaultValue = tag.defaultValue
|
||||
this.requiresRestart = tag.requiresRestart
|
||||
//TODO: remove after getting rid of old logging style "if (L.isEnabled(...))"
|
||||
@Suppress("DEPRECATION")
|
||||
enabled = PreferenceManager.getDefaultSharedPreferences(MainApp.instance()).getBoolean(getSPName(), defaultValue)
|
||||
}
|
||||
|
||||
internal constructor(defaultValue: Boolean) {
|
||||
name = "NONEXISTING"
|
||||
this.defaultValue = defaultValue
|
||||
enabled = defaultValue
|
||||
}
|
||||
|
||||
private fun getSPName(): String = "log_$name"
|
||||
|
||||
fun enable(enabled: Boolean) {
|
||||
this.enabled = enabled
|
||||
@Suppress("DEPRECATION")
|
||||
PreferenceManager.getDefaultSharedPreferences(MainApp.instance()).edit().putBoolean(getSPName(), enabled).apply()
|
||||
}
|
||||
|
||||
fun resetToDefault() {
|
||||
enable(defaultValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,9 +3,8 @@ package info.nightscout.androidaps.plugins.aps.loop;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
/*
|
||||
|
|
@ -366,7 +365,7 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
|||
*/
|
||||
|
||||
public class DeviceStatus {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
|
||||
public String device = null;
|
||||
public JSONObject pump = null;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import org.json.JSONArray;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -32,6 +31,7 @@ import info.nightscout.androidaps.events.Event;
|
|||
import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
|
||||
import info.nightscout.androidaps.events.EventNsFood;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus;
|
||||
import info.nightscout.androidaps.utils.FabricPrivacy;
|
||||
|
|
@ -43,7 +43,7 @@ import io.reactivex.schedulers.Schedulers;
|
|||
*/
|
||||
|
||||
public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
||||
private Logger log = StacktraceLoggerWrapper.getLogger(L.DATAFOOD);
|
||||
private Logger log = StacktraceLoggerWrapper.getLogger(LTag.DATAFOOD);
|
||||
private CompositeDisposable disposable = new CompositeDisposable();
|
||||
|
||||
private static final ScheduledExecutorService foodEventWorker = Executors.newSingleThreadScheduledExecutor();
|
||||
|
|
@ -98,7 +98,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
public void onCreate() {
|
||||
super.onCreate();
|
||||
try {
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.info("onCreate");
|
||||
TableUtils.createTableIfNotExists(this.getConnectionSource(), Food.class);
|
||||
} catch (SQLException e) {
|
||||
|
|
@ -108,7 +108,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
}
|
||||
|
||||
public void onUpgrade(ConnectionSource connectionSource, int oldVersion, int newVersion) {
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.info("onUpgrade");
|
||||
// this.resetFood();
|
||||
}
|
||||
|
|
@ -147,7 +147,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
|
||||
class PostRunnable implements Runnable {
|
||||
public void run() {
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.debug("Firing EventFoodChange");
|
||||
RxBus.Companion.getINSTANCE().send(event);
|
||||
callback.setPost(null);
|
||||
|
|
@ -258,7 +258,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
public void deleteByNSId(String _id) throws SQLException {
|
||||
Food stored = this.findByNSId(_id);
|
||||
if (stored != null) {
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.debug("Removing Food record from database: " + stored.toString());
|
||||
this.delete(stored);
|
||||
}
|
||||
|
|
@ -312,7 +312,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
public void createOrUpdate(Food food) {
|
||||
try {
|
||||
this.getDao().createOrUpdate(food);
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.debug("Created or Updated: " + food.toString());
|
||||
} catch (SQLException e) {
|
||||
log.error("Unable to createOrUpdate Food", e);
|
||||
|
|
@ -323,7 +323,7 @@ public class FoodService extends OrmLiteBaseService<DatabaseHelper> {
|
|||
public void create(Food food) {
|
||||
try {
|
||||
this.getDao().create(food);
|
||||
if (L.isEnabled(L.DATAFOOD))
|
||||
if (L.isEnabled(LTag.DATAFOOD))
|
||||
log.debug("New record: " + food.toString());
|
||||
} catch (SQLException e) {
|
||||
log.error("Unable to create Food", e);
|
||||
|
|
|
|||
|
|
@ -1,19 +1,14 @@
|
|||
package info.nightscout.androidaps.plugins.general.maintenance;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import ch.qos.logback.classic.LoggerContext;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
/**
|
||||
* This class provides serveral methods for log-handling (eg. sending logs as emails).
|
||||
*/
|
||||
public class LoggerUtils {
|
||||
|
||||
private static final Logger LOGGER = StacktraceLoggerWrapper.getLogger(L.CORE);
|
||||
|
||||
public static String SUFFIX = ".log.zip";
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -9,9 +9,12 @@ import info.nightscout.androidaps.R
|
|||
import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
|
||||
import info.nightscout.androidaps.logging.L
|
||||
import kotlinx.android.synthetic.main.activity_logsetting.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class LogSettingActivity : NoSplashAppCompatActivity() {
|
||||
|
||||
@Inject lateinit var l :L
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_logsetting)
|
||||
|
|
@ -19,7 +22,7 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
|
|||
createViewsForSettings()
|
||||
|
||||
logsettings_reset.setOnClickListener {
|
||||
L.resetToDefaults()
|
||||
l.resetToDefaults()
|
||||
createViewsForSettings()
|
||||
}
|
||||
ok.setOnClickListener { finish() }
|
||||
|
|
@ -27,7 +30,7 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
|
|||
|
||||
private fun createViewsForSettings() {
|
||||
logsettings_placeholder.removeAllViews()
|
||||
for (element in L.getLogElements()) {
|
||||
for (element in l.getLogElements()) {
|
||||
val logViewHolder = LogViewHolder(element)
|
||||
logsettings_placeholder.addView(logViewHolder.baseView)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import info.nightscout.androidaps.db.TempTarget;
|
|||
import info.nightscout.androidaps.db.TemporaryBasal;
|
||||
import info.nightscout.androidaps.interfaces.PumpInterface;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.aps.loop.APSResult;
|
||||
import info.nightscout.androidaps.plugins.aps.loop.DeviceStatus;
|
||||
|
|
@ -50,7 +51,7 @@ import info.nightscout.androidaps.utils.SP;
|
|||
* Created by mike on 26.05.2017.
|
||||
*/
|
||||
public class NSUpload {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
|
||||
public static void uploadTempBasalStartAbsolute(TemporaryBasal temporaryBasal, Double originalExtendedAmount) {
|
||||
try {
|
||||
|
|
@ -200,7 +201,7 @@ public class NSUpload {
|
|||
deviceStatus.enacted.put("requested", requested);
|
||||
}
|
||||
} else {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("OpenAPS data too old to upload, sending iob only");
|
||||
IobTotal[] iob = iobCobCalculatorPlugin.calculateIobArrayInDia(profile);
|
||||
if (iob.length > 0) {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import com.j256.ormlite.dao.CloseableIterator;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.sql.SQLException;
|
||||
|
||||
|
|
@ -18,6 +17,7 @@ import info.nightscout.androidaps.R;
|
|||
import info.nightscout.androidaps.db.DatabaseHelper;
|
||||
import info.nightscout.androidaps.db.DbRequest;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus;
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientResend;
|
||||
|
|
@ -28,7 +28,7 @@ import info.nightscout.androidaps.utils.SP;
|
|||
* Created by mike on 21.02.2016.
|
||||
*/
|
||||
public class UploadQueue {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
|
||||
public static String status() {
|
||||
return "QUEUE: " + MainApp.getDbHelper().size(DatabaseHelper.DATABASE_DBREQUESTS);
|
||||
|
|
@ -48,7 +48,7 @@ public class UploadQueue {
|
|||
|
||||
public static void add(final DbRequest dbr) {
|
||||
if (SP.getBoolean(R.string.key_ns_noupload, false)) return;
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("Adding to queue: " + dbr.log());
|
||||
try {
|
||||
MainApp.getDbHelper().create(dbr);
|
||||
|
|
@ -62,10 +62,10 @@ public class UploadQueue {
|
|||
startService();
|
||||
if (NSClientService.handler != null) {
|
||||
NSClientService.handler.post(() -> {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("ClearQueue");
|
||||
MainApp.getDbHelper().deleteAllDbRequests();
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug(status());
|
||||
});
|
||||
}
|
||||
|
|
@ -83,7 +83,7 @@ public class UploadQueue {
|
|||
return;
|
||||
}
|
||||
if (MainApp.getDbHelper().deleteDbRequest(id) == 1) {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("Removed item from UploadQueue. " + UploadQueue.status());
|
||||
}
|
||||
} catch (JSONException e) {
|
||||
|
|
@ -100,7 +100,7 @@ public class UploadQueue {
|
|||
if (NSClientService.handler != null) {
|
||||
NSClientService.handler.post(() -> {
|
||||
MainApp.getDbHelper().deleteDbRequestbyMongoId(action, _id);
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("Removing " + _id + " from UploadQueue. " + UploadQueue.status());
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks;
|
|||
import org.json.JSONArray;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.events.Event;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus;
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientRestart;
|
||||
|
|
@ -16,7 +16,7 @@ import io.socket.client.Ack;
|
|||
* Created by mike on 29.12.2015.
|
||||
*/
|
||||
public class NSAddAck extends Event implements Ack {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
public String _id = null;
|
||||
public String nsClientID = null;
|
||||
public JSONObject json = null;
|
||||
|
|
@ -48,7 +48,7 @@ public class NSAddAck extends Event implements Ack {
|
|||
RxBus.Companion.getINSTANCE().send(new EventNSClientRestart());
|
||||
return;
|
||||
}
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("DBACCESS " + response.getString("result"));
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ package info.nightscout.androidaps.plugins.general.nsclient.acks;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.events.Event;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBus;
|
||||
import io.socket.client.Ack;
|
||||
|
|
@ -15,12 +14,13 @@ import io.socket.client.Ack;
|
|||
* Created by mike on 21.02.2016.
|
||||
*/
|
||||
public class NSUpdateAck extends Event implements Ack {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
public boolean result = false;
|
||||
public String _id;
|
||||
public String action;
|
||||
public void call(Object...args) {
|
||||
JSONObject response = (JSONObject)args[0];
|
||||
|
||||
public void call(Object... args) {
|
||||
JSONObject response = (JSONObject) args[0];
|
||||
if (response.has("result"))
|
||||
try {
|
||||
if (response.getString("result").equals("success"))
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ package info.nightscout.androidaps.plugins.general.nsclient.data;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
public class NSMbg {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
public long date;
|
||||
public double mbg;
|
||||
public String json;
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import org.slf4j.Logger;
|
|||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
/**
|
||||
|
|
@ -13,7 +14,7 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
|||
* {"mgdl":105,"mills":1455136282375,"device":"xDrip-BluetoothWixel","direction":"Flat","filtered":98272,"unfiltered":98272,"noise":1,"rssi":100}
|
||||
*/
|
||||
public class NSSgv {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
|
||||
private JSONObject data;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,14 @@ package info.nightscout.androidaps.plugins.general.nsclient.data;
|
|||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
public class NSTreatment {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
|
||||
private JSONObject data;
|
||||
private String action = null; // "update", "remove" or null (add)
|
||||
|
|
@ -82,15 +81,47 @@ public class NSTreatment {
|
|||
return ret;
|
||||
}
|
||||
|
||||
public String getAction() { return action; }
|
||||
public JSONObject getData() { return data; }
|
||||
public String get_id() { return getStringOrNull("_id"); }
|
||||
public String getEnteredBy() { return getStringOrNull("enteredBy"); }
|
||||
public String getEventType() { return getStringOrNull("eventType"); }
|
||||
public Integer getHapp_id() { return getIntegerOrNull("happ_id"); }
|
||||
public Integer getDuration() { return getIntegerOrNull("duration"); }
|
||||
public Integer getMgdl() { return getIntegerOrNull("mgdl"); }
|
||||
public Double getAbsolute() { return getDoubleOrNull("absolute"); }
|
||||
public Long getMills() { return getLongOrNull("mills"); }
|
||||
public Date getCreated_at() { return getDateOrNull("created_at"); }
|
||||
public String getAction() {
|
||||
return action;
|
||||
}
|
||||
|
||||
public JSONObject getData() {
|
||||
return data;
|
||||
}
|
||||
|
||||
public String get_id() {
|
||||
return getStringOrNull("_id");
|
||||
}
|
||||
|
||||
public String getEnteredBy() {
|
||||
return getStringOrNull("enteredBy");
|
||||
}
|
||||
|
||||
public String getEventType() {
|
||||
return getStringOrNull("eventType");
|
||||
}
|
||||
|
||||
public Integer getHapp_id() {
|
||||
return getIntegerOrNull("happ_id");
|
||||
}
|
||||
|
||||
public Integer getDuration() {
|
||||
return getIntegerOrNull("duration");
|
||||
}
|
||||
|
||||
public Integer getMgdl() {
|
||||
return getIntegerOrNull("mgdl");
|
||||
}
|
||||
|
||||
public Double getAbsolute() {
|
||||
return getDoubleOrNull("absolute");
|
||||
}
|
||||
|
||||
public Long getMills() {
|
||||
return getLongOrNull("mills");
|
||||
}
|
||||
|
||||
public Date getCreated_at() {
|
||||
return getDateOrNull("created_at");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ public class NSClientService extends DaggerService {
|
|||
@Inject NSClientPlugin nsClientPlugin;
|
||||
@Inject BuildHelper buildHelper;
|
||||
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.NSCLIENT);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.NSCLIENT);
|
||||
private CompositeDisposable disposable = new CompositeDisposable();
|
||||
|
||||
static public PowerManager.WakeLock mWakeLock;
|
||||
|
|
@ -178,7 +178,7 @@ public class NSClientService extends DaggerService {
|
|||
.toObservable(EventAppExit.class)
|
||||
.observeOn(Schedulers.io())
|
||||
.subscribe(event -> {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("EventAppExit received");
|
||||
destroy();
|
||||
stopSelf();
|
||||
|
|
@ -367,7 +367,7 @@ public class NSClientService extends DaggerService {
|
|||
private Emitter.Listener onDisconnect = new Emitter.Listener() {
|
||||
@Override
|
||||
public void call(Object... args) {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("disconnect reason: {}", args);
|
||||
rxBus.send(new EventNSClientNewLog("NSCLIENT", "disconnect event"));
|
||||
}
|
||||
|
|
@ -804,7 +804,7 @@ public class NSClientService extends DaggerService {
|
|||
if (mSocket == null || !mSocket.connected()) return;
|
||||
|
||||
if (lastResendTime > System.currentTimeMillis() - 10 * 1000L) {
|
||||
if (L.isEnabled(L.NSCLIENT))
|
||||
if (L.isEnabled(LTag.NSCLIENT))
|
||||
log.debug("Skipping resend by lastResendTime: " + ((System.currentTimeMillis() - lastResendTime) / 1000L) + " sec");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import info.nightscout.androidaps.plugins.bus.RxBusWrapper
|
|||
import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
|
||||
import info.nightscout.androidaps.services.AlarmSoundService
|
||||
import info.nightscout.androidaps.utils.DateUtil
|
||||
import info.nightscout.androidaps.utils.resources.IconsProvider
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import java.util.*
|
||||
|
|
@ -36,7 +37,8 @@ class NotificationStore @Inject constructor(
|
|||
private val sp: SP,
|
||||
private val rxBus: RxBusWrapper,
|
||||
private val resourceHelper: ResourceHelper,
|
||||
private val context: Context
|
||||
private val context: Context,
|
||||
private val iconsProvider: IconsProvider
|
||||
) {
|
||||
|
||||
var store: MutableList<Notification> = ArrayList()
|
||||
|
|
@ -109,8 +111,8 @@ class NotificationStore @Inject constructor(
|
|||
|
||||
private fun raiseSystemNotification(n: Notification) {
|
||||
val mgr = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
|
||||
val largeIcon = resourceHelper.decodeResource(resourceHelper.getIcon())
|
||||
val smallIcon = resourceHelper.getNotificationIcon()
|
||||
val largeIcon = resourceHelper.decodeResource(iconsProvider.getIcon())
|
||||
val smallIcon = iconsProvider.getNotificationIcon()
|
||||
val sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
|
||||
val notificationBuilder = NotificationCompat.Builder(context, CHANNEL_ID)
|
||||
.setSmallIcon(smallIcon)
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventAutos
|
|||
import info.nightscout.androidaps.utils.DecimalFormatter
|
||||
import info.nightscout.androidaps.utils.FabricPrivacy
|
||||
import info.nightscout.androidaps.utils.androidNotification.NotificationHolder
|
||||
import info.nightscout.androidaps.utils.resources.IconsProvider
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import io.reactivex.disposables.CompositeDisposable
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
|
|
@ -45,7 +46,8 @@ class PersistentNotificationPlugin @Inject constructor(
|
|||
private var iobCobCalculatorPlugin: IobCobCalculatorPlugin,
|
||||
private var rxBus: RxBusWrapper,
|
||||
private var context: Context,
|
||||
private var notificationHolder: NotificationHolder
|
||||
private var notificationHolder: NotificationHolder,
|
||||
private val iconsProvider: IconsProvider
|
||||
) : PluginBase(PluginDescription()
|
||||
.mainType(PluginType.GENERAL)
|
||||
.neverVisible(true)
|
||||
|
|
@ -209,8 +211,8 @@ class PersistentNotificationPlugin @Inject constructor(
|
|||
builder.setOngoing(true)
|
||||
builder.setOnlyAlertOnce(true)
|
||||
builder.setCategory(NotificationCompat.CATEGORY_STATUS)
|
||||
builder.setSmallIcon(resourceHelper.getNotificationIcon())
|
||||
builder.setLargeIcon(resourceHelper.decodeResource(resourceHelper.getIcon()))
|
||||
builder.setSmallIcon(iconsProvider.getNotificationIcon())
|
||||
builder.setLargeIcon(resourceHelper.decodeResource(iconsProvider.getIcon()))
|
||||
if (line1 != null) builder.setContentTitle(line1)
|
||||
if (line2 != null) builder.setContentText(line2)
|
||||
if (line3 != null) builder.setSubText(line3)
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@ import android.bluetooth.BluetoothSocket;
|
|||
import android.os.SystemClock;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
|
||||
import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageHashTableBase;
|
||||
|
|
@ -21,7 +21,7 @@ import info.nightscout.androidaps.utils.CRC;
|
|||
* Created by mike on 17.07.2016.
|
||||
*/
|
||||
public class SerialIOThread extends AbstractSerialIOThread {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPBTCOMM);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.PUMPBTCOMM);
|
||||
|
||||
private InputStream mInputStream = null;
|
||||
private OutputStream mOutputStream = null;
|
||||
|
|
@ -76,7 +76,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
|
|||
message = hashTable.findMessage(command);
|
||||
}
|
||||
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug("<<<<< " + message.getMessageName() + " " + MessageBase.toHexString(extractedBuff));
|
||||
|
||||
// process the message content
|
||||
|
|
@ -152,7 +152,7 @@ public class SerialIOThread extends AbstractSerialIOThread {
|
|||
processedMessage = message;
|
||||
|
||||
byte[] messageBytes = message.getRawMessageBytes();
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug(">>>>> " + message.getMessageName() + " " + MessageBase.toHexString(messageBytes));
|
||||
|
||||
try {
|
||||
|
|
@ -172,11 +172,11 @@ public class SerialIOThread extends AbstractSerialIOThread {
|
|||
SystemClock.sleep(200);
|
||||
if (!message.isReceived()) {
|
||||
message.handleMessageNotReceived();
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.error("Reply not received " + message.getMessageName());
|
||||
if (message.getCommand() == 0xF0F1) {
|
||||
danaRPump.setNewPump(false);
|
||||
if (L.isEnabled(L.PUMPCOMM))
|
||||
if (L.isEnabled(LTag.PUMPCOMM))
|
||||
log.debug("Old firmware detected");
|
||||
}
|
||||
}
|
||||
|
|
@ -188,28 +188,28 @@ public class SerialIOThread extends AbstractSerialIOThread {
|
|||
try {
|
||||
mInputStream.close();
|
||||
} catch (Exception e) {
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug(e.getMessage());
|
||||
}
|
||||
try {
|
||||
mOutputStream.close();
|
||||
} catch (Exception e) {
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug(e.getMessage());
|
||||
}
|
||||
try {
|
||||
mRfCommSocket.close();
|
||||
} catch (Exception e) {
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug(e.getMessage());
|
||||
}
|
||||
try {
|
||||
System.runFinalization();
|
||||
} catch (Exception e) {
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug(e.getMessage());
|
||||
}
|
||||
if (L.isEnabled(L.PUMPBTCOMM))
|
||||
if (L.isEnabled(LTag.PUMPBTCOMM))
|
||||
log.debug("Disconnected: " + reason);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import info.nightscout.androidaps.events.EventInitializationChanged
|
|||
import info.nightscout.androidaps.interfaces.CommandQueueProvider
|
||||
import info.nightscout.androidaps.interfaces.PluginType
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.L
|
||||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper
|
||||
import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
|
||||
|
|
@ -71,16 +70,15 @@ class DanaRUserOptionsActivity : NoSplashAppCompatActivity() {
|
|||
|
||||
save_user_options.setOnClickListener { onSaveClick() }
|
||||
|
||||
if (L.isEnabled(L.PUMP))
|
||||
aapsLogger.debug(LTag.PUMP,
|
||||
"UserOptionsLoaded:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
|
||||
+ "\ntimeDisplayType:" + danaRPump.timeDisplayType
|
||||
+ "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
|
||||
+ "\ntimeDisplayType:" + danaRPump.timeDisplayType
|
||||
+ "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
|
||||
+ "\nbackLight:" + danaRPump.backlightOnTimeSec
|
||||
+ "\npumpUnits:" + danaRPump.units
|
||||
+ "\nlowReservoir:" + danaRPump.lowReservoirRate)
|
||||
aapsLogger.debug(LTag.PUMP,
|
||||
"UserOptionsLoaded:" + (System.currentTimeMillis() - danaRPump.lastConnection) / 1000 + " s ago"
|
||||
+ "\ntimeDisplayType:" + danaRPump.timeDisplayType
|
||||
+ "\nbuttonScroll:" + danaRPump.buttonScrollOnOff
|
||||
+ "\ntimeDisplayType:" + danaRPump.timeDisplayType
|
||||
+ "\nlcdOnTimeSec:" + danaRPump.lcdOnTimeSec
|
||||
+ "\nbackLight:" + danaRPump.backlightOnTimeSec
|
||||
+ "\npumpUnits:" + danaRPump.units
|
||||
+ "\nlowReservoir:" + danaRPump.lowReservoirRate)
|
||||
|
||||
danar_screentimeout.setParams(danaRPump.lcdOnTimeSec.toDouble(), 5.0, 240.0, 5.0, DecimalFormat("1"), false, save_user_options)
|
||||
danar_backlight.setParams(danaRPump.backlightOnTimeSec.toDouble(), 1.0, 60.0, 1.0, DecimalFormat("1"), false, save_user_options)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ import java.util.Date;
|
|||
import java.util.GregorianCalendar;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.utils.CRC;
|
||||
|
||||
|
|
@ -23,7 +24,7 @@ import info.nightscout.androidaps.utils.CRC;
|
|||
*/
|
||||
|
||||
public class MessageBase {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.PUMPCOMM);
|
||||
public byte[] buffer = new byte[512];
|
||||
private int position = 6;
|
||||
|
||||
|
|
@ -96,7 +97,7 @@ public class MessageBase {
|
|||
}
|
||||
|
||||
public void handleMessage(byte[] bytes) {
|
||||
if (L.isEnabled(L.PUMPCOMM)) {
|
||||
if (L.isEnabled(LTag.PUMPCOMM)) {
|
||||
if (bytes.length > 6) {
|
||||
int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
|
||||
log.debug("UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
package info.nightscout.androidaps.plugins.pump.danaR.comm
|
||||
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.L
|
||||
import info.nightscout.androidaps.logging.L.isEnabled
|
||||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper.Companion.getLogger
|
||||
import org.slf4j.Logger
|
||||
|
||||
class MsgSetTempBasalStop(
|
||||
private val aapsLogger: AAPSLogger
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ package info.nightscout.androidaps.plugins.pump.medtronic.comm.history.cgms;
|
|||
|
||||
import org.joda.time.LocalDateTime;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
import info.nightscout.androidaps.plugins.pump.common.utils.DateTimeUtil;
|
||||
import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.MedtronicHistoryDecoder;
|
||||
|
|
@ -23,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.medtronic.comm.history.RecordDeco
|
|||
|
||||
public class MedtronicCGMSHistoryDecoder extends MedtronicHistoryDecoder<CGMSHistoryEntry> {
|
||||
|
||||
private static final Logger LOG = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
|
||||
private static final Logger LOG = StacktraceLoggerWrapper.getLogger(LTag.PUMPCOMM);
|
||||
|
||||
|
||||
// CGMSValuesWriter cgmsValuesWriter = null;
|
||||
|
|
|
|||
|
|
@ -364,7 +364,7 @@ public class BasalProfile {
|
|||
|
||||
|
||||
private boolean isLogEnabled() {
|
||||
return L.isEnabled(L.PUMPCOMM);
|
||||
return L.isEnabled(LTag.PUMPCOMM);
|
||||
}
|
||||
|
||||
public boolean verify(PumpType pumpType) {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class TempBasalPair extends info.nightscout.androidaps.plugins.pump.commo
|
|||
public TempBasalPair(AAPSLogger aapsLogger, byte[] response) {
|
||||
super();
|
||||
|
||||
if (L.isEnabled(L.PUMPCOMM))
|
||||
if (L.isEnabled(LTag.PUMPCOMM))
|
||||
aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
|
||||
|
||||
isPercent = response[0] == 1;
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import java.util.Date;
|
|||
import info.nightscout.androidaps.data.DetailedBolusInfo;
|
||||
import info.nightscout.androidaps.data.PumpEnactResult;
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
|
||||
import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
|
||||
|
|
@ -19,7 +20,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
|
|||
public class OmnipodUIPostprocessor {
|
||||
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
|
||||
private static final Logger LOG = LoggerFactory.getLogger(LTag.PUMP.name());
|
||||
|
||||
private OmnipodPumpStatus pumpStatus;
|
||||
private OmnipodPumpPluginInterface omnipodPumpPlugin;
|
||||
|
|
@ -102,7 +103,7 @@ public class OmnipodUIPostprocessor {
|
|||
|
||||
|
||||
private boolean isLogEnabled() {
|
||||
return L.isEnabled(L.PUMP);
|
||||
return L.isEnabled(LTag.PUMP);
|
||||
}
|
||||
|
||||
public RxBusWrapper getRxBus() {
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ import info.nightscout.androidaps.interfaces.PluginBase
|
|||
import info.nightscout.androidaps.interfaces.PluginDescription
|
||||
import info.nightscout.androidaps.interfaces.PluginType
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.L
|
||||
import info.nightscout.androidaps.logging.L.isEnabled
|
||||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
|
||||
import info.nightscout.androidaps.utils.DateUtil
|
||||
|
|
@ -48,33 +46,29 @@ class EversensePlugin @Inject constructor(
|
|||
override fun handleNewData(intent: Intent) {
|
||||
if (!isEnabled(PluginType.BGSOURCE)) return
|
||||
val bundle = intent.extras ?: return
|
||||
if (isEnabled(L.BGSOURCE)) {
|
||||
if (bundle.containsKey("currentCalibrationPhase")) aapsLogger.debug(LTag.BGSOURCE, "currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"))
|
||||
if (bundle.containsKey("placementModeInProgress")) aapsLogger.debug(LTag.BGSOURCE, "placementModeInProgress: " + bundle.getBoolean("placementModeInProgress"))
|
||||
if (bundle.containsKey("glucoseLevel")) aapsLogger.debug(LTag.BGSOURCE, "glucoseLevel: " + bundle.getInt("glucoseLevel"))
|
||||
if (bundle.containsKey("glucoseTrendDirection")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTrendDirection: " + bundle.getString("glucoseTrendDirection"))
|
||||
if (bundle.containsKey("glucoseTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("glucoseTimestamp")))
|
||||
if (bundle.containsKey("batteryLevel")) aapsLogger.debug(LTag.BGSOURCE, "batteryLevel: " + bundle.getString("batteryLevel"))
|
||||
if (bundle.containsKey("signalStrength")) aapsLogger.debug(LTag.BGSOURCE, "signalStrength: " + bundle.getString("signalStrength"))
|
||||
if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
|
||||
if (bundle.containsKey("isXLVersion")) aapsLogger.debug(LTag.BGSOURCE, "isXLVersion: " + bundle.getBoolean("isXLVersion"))
|
||||
if (bundle.containsKey("transmitterModelNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterModelNumber: " + bundle.getString("transmitterModelNumber"))
|
||||
if (bundle.containsKey("transmitterSerialNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterSerialNumber: " + bundle.getString("transmitterSerialNumber"))
|
||||
if (bundle.containsKey("transmitterAddress")) aapsLogger.debug(LTag.BGSOURCE, "transmitterAddress: " + bundle.getString("transmitterAddress"))
|
||||
if (bundle.containsKey("sensorInsertionTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "sensorInsertionTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("sensorInsertionTimestamp")))
|
||||
if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
|
||||
if (bundle.containsKey("transmitterConnectionState")) aapsLogger.debug(LTag.BGSOURCE, "transmitterConnectionState: " + bundle.getString("transmitterConnectionState"))
|
||||
}
|
||||
if (bundle.containsKey("currentCalibrationPhase")) aapsLogger.debug(LTag.BGSOURCE, "currentCalibrationPhase: " + bundle.getString("currentCalibrationPhase"))
|
||||
if (bundle.containsKey("placementModeInProgress")) aapsLogger.debug(LTag.BGSOURCE, "placementModeInProgress: " + bundle.getBoolean("placementModeInProgress"))
|
||||
if (bundle.containsKey("glucoseLevel")) aapsLogger.debug(LTag.BGSOURCE, "glucoseLevel: " + bundle.getInt("glucoseLevel"))
|
||||
if (bundle.containsKey("glucoseTrendDirection")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTrendDirection: " + bundle.getString("glucoseTrendDirection"))
|
||||
if (bundle.containsKey("glucoseTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("glucoseTimestamp")))
|
||||
if (bundle.containsKey("batteryLevel")) aapsLogger.debug(LTag.BGSOURCE, "batteryLevel: " + bundle.getString("batteryLevel"))
|
||||
if (bundle.containsKey("signalStrength")) aapsLogger.debug(LTag.BGSOURCE, "signalStrength: " + bundle.getString("signalStrength"))
|
||||
if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
|
||||
if (bundle.containsKey("isXLVersion")) aapsLogger.debug(LTag.BGSOURCE, "isXLVersion: " + bundle.getBoolean("isXLVersion"))
|
||||
if (bundle.containsKey("transmitterModelNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterModelNumber: " + bundle.getString("transmitterModelNumber"))
|
||||
if (bundle.containsKey("transmitterSerialNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterSerialNumber: " + bundle.getString("transmitterSerialNumber"))
|
||||
if (bundle.containsKey("transmitterAddress")) aapsLogger.debug(LTag.BGSOURCE, "transmitterAddress: " + bundle.getString("transmitterAddress"))
|
||||
if (bundle.containsKey("sensorInsertionTimestamp")) aapsLogger.debug(LTag.BGSOURCE, "sensorInsertionTimestamp: " + DateUtil.dateAndTimeString(bundle.getLong("sensorInsertionTimestamp")))
|
||||
if (bundle.containsKey("transmitterVersionNumber")) aapsLogger.debug(LTag.BGSOURCE, "transmitterVersionNumber: " + bundle.getString("transmitterVersionNumber"))
|
||||
if (bundle.containsKey("transmitterConnectionState")) aapsLogger.debug(LTag.BGSOURCE, "transmitterConnectionState: " + bundle.getString("transmitterConnectionState"))
|
||||
if (bundle.containsKey("glucoseLevels")) {
|
||||
val glucoseLevels = bundle.getIntArray("glucoseLevels")
|
||||
val glucoseRecordNumbers = bundle.getIntArray("glucoseRecordNumbers")
|
||||
val glucoseTimestamps = bundle.getLongArray("glucoseTimestamps")
|
||||
if (glucoseLevels != null && glucoseRecordNumbers != null && glucoseTimestamps != null) {
|
||||
if (isEnabled(L.BGSOURCE)) {
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseLevels" + Arrays.toString(glucoseLevels))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseRecordNumbers" + Arrays.toString(glucoseRecordNumbers))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamps" + Arrays.toString(glucoseTimestamps))
|
||||
}
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseLevels" + Arrays.toString(glucoseLevels))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseRecordNumbers" + Arrays.toString(glucoseRecordNumbers))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "glucoseTimestamps" + Arrays.toString(glucoseTimestamps))
|
||||
for (i in glucoseLevels.indices) {
|
||||
val bgReading = BgReading()
|
||||
bgReading.value = glucoseLevels[i].toDouble()
|
||||
|
|
@ -95,11 +89,9 @@ class EversensePlugin @Inject constructor(
|
|||
val calibrationTimestamps = bundle.getLongArray("calibrationTimestamps")
|
||||
val calibrationRecordNumbers = bundle.getLongArray("calibrationRecordNumbers")
|
||||
if (calibrationGlucoseLevels != null && calibrationTimestamps != null && calibrationRecordNumbers != null) {
|
||||
if (isEnabled(L.BGSOURCE)) {
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationGlucoseLevels" + Arrays.toString(calibrationGlucoseLevels))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationTimestamps" + Arrays.toString(calibrationTimestamps))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationRecordNumbers" + Arrays.toString(calibrationRecordNumbers))
|
||||
}
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationGlucoseLevels" + Arrays.toString(calibrationGlucoseLevels))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationTimestamps" + Arrays.toString(calibrationTimestamps))
|
||||
aapsLogger.debug(LTag.BGSOURCE, "calibrationRecordNumbers" + Arrays.toString(calibrationRecordNumbers))
|
||||
for (i in calibrationGlucoseLevels.indices) {
|
||||
try {
|
||||
if (MainApp.getDbHelper().getCareportalEventFromTimestamp(calibrationTimestamps[i]) == null) {
|
||||
|
|
|
|||
|
|
@ -19,26 +19,6 @@ public class SP {
|
|||
return sharedPreferences.getAll();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void clear() {
|
||||
sharedPreferences.edit().clear().apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public boolean contains(String key) {
|
||||
return sharedPreferences.contains(key);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public boolean contains(int resourceId) {
|
||||
return sharedPreferences.contains(MainApp.gs(resourceId));
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public String getString(int resourceID, String defaultValue) {
|
||||
return sharedPreferences.getString(MainApp.gs(resourceID), defaultValue);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public String getString(String key, String defaultValue) {
|
||||
return sharedPreferences.getString(key, defaultValue);
|
||||
|
|
@ -53,102 +33,6 @@ public class SP {
|
|||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public boolean getBoolean(String key, Boolean defaultValue) {
|
||||
try {
|
||||
return sharedPreferences.getBoolean(key, defaultValue);
|
||||
} catch (Exception e) {
|
||||
return defaultValue;
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public Double getDouble(int resourceID, Double defaultValue) {
|
||||
return SafeParse.stringToDouble(sharedPreferences.getString(MainApp.gs(resourceID), defaultValue.toString()));
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public Double getDouble(String key, Double defaultValue) {
|
||||
return SafeParse.stringToDouble(sharedPreferences.getString(key, defaultValue.toString()));
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public int getInt(int resourceID, Integer defaultValue) {
|
||||
try {
|
||||
return sharedPreferences.getInt(MainApp.gs(resourceID), defaultValue);
|
||||
} catch (Exception e) {
|
||||
return SafeParse.stringToInt(sharedPreferences.getString(MainApp.gs(resourceID), defaultValue.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public int getInt(String key, Integer defaultValue) {
|
||||
try {
|
||||
return sharedPreferences.getInt(key, defaultValue);
|
||||
} catch (Exception e) {
|
||||
return SafeParse.stringToInt(sharedPreferences.getString(key, defaultValue.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public long getLong(int resourceID, Long defaultValue) {
|
||||
try {
|
||||
return sharedPreferences.getLong(MainApp.gs(resourceID), defaultValue);
|
||||
} catch (Exception e) {
|
||||
return SafeParse.stringToLong(sharedPreferences.getString(MainApp.gs(resourceID), defaultValue.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public long getLong(String key, Long defaultValue) {
|
||||
try {
|
||||
return sharedPreferences.getLong(key, defaultValue);
|
||||
} catch (Exception e) {
|
||||
return SafeParse.stringToLong(sharedPreferences.getString(key, defaultValue.toString()));
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putBoolean(String key, boolean value) {
|
||||
sharedPreferences.edit().putBoolean(key, value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putBoolean(int resourceID, boolean value) {
|
||||
sharedPreferences.edit().putBoolean(MainApp.gs(resourceID), value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putDouble(String key, double value) {
|
||||
sharedPreferences.edit().putString(key, Double.toString(value)).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putLong(String key, long value) {
|
||||
sharedPreferences.edit().putLong(key, value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putLong(int resourceID, long value) {
|
||||
sharedPreferences.edit().putLong(MainApp.gs(resourceID), value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putInt(String key, int value) {
|
||||
sharedPreferences.edit().putInt(key, value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putInt(int resourceID, int value) {
|
||||
sharedPreferences.edit().putInt(MainApp.gs(resourceID), value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void incInt(int resourceID) {
|
||||
int value = getInt(resourceID, 0) + 1;
|
||||
sharedPreferences.edit().putInt(MainApp.gs(resourceID), value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void putString(int resourceID, String value) {
|
||||
sharedPreferences.edit().putString(MainApp.gs(resourceID), value).apply();
|
||||
|
|
@ -159,11 +43,6 @@ public class SP {
|
|||
sharedPreferences.edit().putString(key, value).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void remove(int resourceID) {
|
||||
sharedPreferences.edit().remove(MainApp.gs(resourceID)).apply();
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
static public void remove(String key) {
|
||||
sharedPreferences.edit().remove(key).apply();
|
||||
|
|
|
|||
|
|
@ -18,13 +18,12 @@ package info.nightscout.androidaps.utils;
|
|||
import android.os.SystemClock;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.net.DatagramPacket;
|
||||
import java.net.DatagramSocket;
|
||||
import java.net.InetAddress;
|
||||
|
||||
import info.nightscout.androidaps.logging.L;
|
||||
import info.nightscout.androidaps.logging.LTag;
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
/**
|
||||
|
|
@ -40,7 +39,7 @@ import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
|||
* </pre>
|
||||
*/
|
||||
public class SntpClient {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(L.CORE);
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.CORE);
|
||||
|
||||
//private static final int REFERENCE_TIME_OFFSET = 16;
|
||||
private static final int ORIGINATE_TIME_OFFSET = 24;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import androidx.core.app.TaskStackBuilder
|
|||
import info.nightscout.androidaps.MainActivity
|
||||
import info.nightscout.androidaps.MainApp
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.utils.resources.IconsProvider
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
|
@ -17,7 +18,8 @@ import javax.inject.Singleton
|
|||
@Singleton
|
||||
class NotificationHolder @Inject constructor(
|
||||
private val resourceHelper: ResourceHelper,
|
||||
private val context: Context
|
||||
private val context: Context,
|
||||
private val iconsProvider: IconsProvider
|
||||
) {
|
||||
|
||||
val channelID = "AndroidAPS-Ongoing"
|
||||
|
|
@ -32,8 +34,8 @@ class NotificationHolder @Inject constructor(
|
|||
.setOngoing(true)
|
||||
.setOnlyAlertOnce(true)
|
||||
.setCategory(NotificationCompat.CATEGORY_STATUS)
|
||||
.setSmallIcon(resourceHelper.getNotificationIcon())
|
||||
.setLargeIcon(resourceHelper.decodeResource(resourceHelper.getIcon()))
|
||||
.setSmallIcon(iconsProvider.getNotificationIcon())
|
||||
.setLargeIcon(resourceHelper.decodeResource(iconsProvider.getIcon()))
|
||||
.setContentTitle(resourceHelper.gs(R.string.loading))
|
||||
.setContentIntent(stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT))
|
||||
notification = builder.build()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
package info.nightscout.androidaps.utils.resources
|
||||
|
||||
import info.nightscout.androidaps.Config
|
||||
import info.nightscout.androidaps.R
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class IconsProvider @Inject constructor() {
|
||||
|
||||
fun getIcon(): Int =
|
||||
when {
|
||||
Config.NSCLIENT -> R.mipmap.ic_yellowowl
|
||||
Config.PUMPCONTROL -> R.mipmap.ic_pumpcontrol
|
||||
else -> R.mipmap.ic_launcher
|
||||
}
|
||||
|
||||
fun getNotificationIcon(): Int =
|
||||
when {
|
||||
Config.NSCLIENT -> R.drawable.ic_notif_nsclient
|
||||
Config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
|
||||
else -> R.drawable.ic_notif_aaps
|
||||
}
|
||||
}
|
||||
|
|
@ -39,17 +39,9 @@
|
|||
<color name="tempTargetConfirmation">#77dd77</color>
|
||||
|
||||
|
||||
<color name="colorPrimary">#212121</color>
|
||||
<color name="colorPrimaryDark">#000000</color>
|
||||
<color name="colorAccent">#40bbaa</color>
|
||||
<color name="mdtp_accent_color">#40bbaa</color>
|
||||
<color name="colorInitializingBorder">#00695c</color>
|
||||
|
||||
<color name="dialog_title_background">#303030</color>
|
||||
<color name="activity_title_background">#121212</color>
|
||||
<color name="dialog_title_color">#FFFFFF</color>
|
||||
<color name="dialog_title_icon_tint">#FFFFFF</color>
|
||||
|
||||
<color name="cardColorBackground">#121212</color>
|
||||
<color name="cardObjectiveText">#779ECB</color>
|
||||
|
||||
|
|
@ -91,12 +83,6 @@
|
|||
|
||||
<color name="splashBackground">#2E2E2E</color>
|
||||
|
||||
<color name="warningAlertBackground">#FFFB8C00</color>
|
||||
<color name="warningAlertHeaderText">#FF000000</color>
|
||||
|
||||
<color name="errorAlertBackground">#FFFF5555</color>
|
||||
<color name="errorAlertHeaderText">#FF000000</color>
|
||||
|
||||
<color name="toastBorder">#666666</color>
|
||||
<color name="toastBase">#ffffff</color>
|
||||
<color name="toastOk">#77dd77</color>
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@
|
|||
<string name="openapsma_maxbasal_summary">This value is called max basal in OpenAPS context</string>
|
||||
<string name="openapsma_maxiob_title">Maximum basal IOB OpenAPS can deliver [U]</string>
|
||||
<string name="openapsma_maxiob_summary">This value is called Max IOB in OpenAPS context\nThis is maximal insulin in [U] APS can deliver at once.</string>
|
||||
<string name="dismiss">DISMISS</string>
|
||||
<string name="language" translatable="false">Language</string>
|
||||
|
||||
<string name="password_preferences_encrypt_prompt">You will be asked for master password, which will be used to encrypt exported preferences.</string>
|
||||
|
|
@ -1555,10 +1554,6 @@
|
|||
<string name="rileylink_scanner_scan_stop">STOP</string>
|
||||
<string name="rileylink_scanner_selected_device">Selected</string>
|
||||
<string name="rileylink_scanner_title">RileyLink Scan</string>
|
||||
<string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy not supported.</string>
|
||||
<string name="rileylink_scanner_ble_not_enabled">Bluetooth not enabled.</string>
|
||||
<string name="location_not_found_title">Location Is Not Enabled</string>
|
||||
<string name="location_not_found_message">For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful.</string>
|
||||
<string name="location_yes">Enable</string>
|
||||
<string name="location_no">No</string>
|
||||
<string name="rileylink_scanner_scanning">Scanning</string>
|
||||
|
|
@ -1766,7 +1761,6 @@
|
|||
<string name="timeformat24h">24h</string>
|
||||
<string name="automation_event">Automation event</string>
|
||||
<string name="alreadyset">Already set</string>
|
||||
<string name="message">Message</string>
|
||||
<string name="clearqueueconfirm">Clear queue? All data in queue will be lost!</string>
|
||||
<string name="key_xdripstatus_detailediob" translatable="false">xdripstatus_detailediob</string>
|
||||
<string name="key_xdripstatus_showbgi" translatable="false">xdripstatus_showbgi</string>
|
||||
|
|
@ -1774,7 +1768,6 @@
|
|||
<string name="key_snoozedTo" translatable="false">snoozedTo</string>
|
||||
<string name="key_snooze_dst_in24h" translatable="false">snooze_dst_in24h</string>
|
||||
<string name="key_snooze_loopdisabled" translatable="false">snooze_loopdisabled</string>
|
||||
<string name="key_enable_fabric" translatable="false">enable_fabric</string>
|
||||
<string name="sixdigitnumber" translatable="false">^\\d{6}</string>
|
||||
<string name="ebstopsloop">Use of Extended bolus feature will stop closed loop mode for the time of running extended bolus. Do you really want it?</string>
|
||||
<string name="closed_loop_disabled_with_eb">Closed loop disabled because of running Extended bolus</string>
|
||||
|
|
|
|||
|
|
@ -70,31 +70,7 @@
|
|||
<item name="android:textColor">#ff0000</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialog" parent="AppTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/warningAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/warningAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_warning</item>
|
||||
<item name="colorAccent">@color/warningAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialog" parent="AppTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/errorAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/errorAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_error</item>
|
||||
<item name="colorAccent">@color/errorAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="WizardPagePodContent">
|
||||
<style name="WizardPagePodContent">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginBottom">8dp</item>
|
||||
|
|
|
|||
13
build.gradle
13
build.gradle
|
|
@ -1,7 +1,16 @@
|
|||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.3.71'
|
||||
ext {
|
||||
kotlin_version = '1.3.72'
|
||||
android_ktx_version = '1.2.0'
|
||||
rxjava_version = '2.2.19'
|
||||
rxandroid_version = '2.1.1'
|
||||
rxkotlin_version = '2.4.0'
|
||||
room_version = '2.2.5'
|
||||
lifecycle_version = '2.2.0'
|
||||
dagger_version = '2.27'
|
||||
}
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
|
@ -29,7 +38,7 @@ allprojects {
|
|||
}
|
||||
ivy {
|
||||
url 'https://github.com/'
|
||||
layout 'pattern', {
|
||||
patternLayout {
|
||||
artifact '/[organisation]/[module]/archive/[revision].[ext]'
|
||||
}
|
||||
}
|
||||
|
|
|
|||
1
core/.gitignore
vendored
Normal file
1
core/.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
/build
|
||||
68
core/build.gradle
Normal file
68
core/build.gradle
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
apply plugin: 'com.android.library'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
android {
|
||||
compileSdkVersion 28
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 28
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles 'consumer-rules.pro'
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = '1.8'
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
debug {
|
||||
testCoverageEnabled(project.hasProperty('coverage'))
|
||||
}
|
||||
firebaseDisable {
|
||||
System.setProperty("disableFirebase", "true")
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
implementation 'androidx.appcompat:appcompat:1.1.0'
|
||||
implementation "androidx.preference:preference-ktx:1.1.1"
|
||||
|
||||
implementation "com.google.dagger:dagger-android:$dagger_version"
|
||||
implementation "com.google.dagger:dagger-android-support:$dagger_version"
|
||||
annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
|
||||
annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
|
||||
kapt "com.google.dagger:dagger-android-processor:$dagger_version"
|
||||
kapt "com.google.dagger:dagger-compiler:$dagger_version"
|
||||
|
||||
//Logger
|
||||
implementation 'org.slf4j:slf4j-api:1.7.30'
|
||||
//Fabric
|
||||
implementation 'com.google.firebase:firebase-core:17.4.0'
|
||||
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
|
||||
transitive = true;
|
||||
}
|
||||
//RxBus
|
||||
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
|
||||
implementation 'org.apache.commons:commons-lang3:3.10'
|
||||
|
||||
testImplementation 'junit:junit:4.13'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
||||
}
|
||||
0
core/consumer-rules.pro
Normal file
0
core/consumer-rules.pro
Normal file
21
core/proguard-rules.pro
vendored
Normal file
21
core/proguard-rules.pro
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
package info.nightscout.androidaps.core
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Instrumented test, which will execute on an Android device.
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
@RunWith(AndroidJUnit4::class)
|
||||
class ExampleInstrumentedTest {
|
||||
|
||||
@Test
|
||||
fun useAppContext() {
|
||||
// Context of the app under test.
|
||||
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
||||
assertEquals("info.nightscout.androidaps.core.test", appContext.packageName)
|
||||
}
|
||||
}
|
||||
5
core/src/main/AndroidManifest.xml
Normal file
5
core/src/main/AndroidManifest.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="info.nightscout.androidaps.core" >
|
||||
|
||||
<uses-permission android:name="android.permission.BLUETOOTH" />
|
||||
</manifest>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
package info.nightscout.androidaps.core.dependencyInjection
|
||||
|
||||
import android.content.Context
|
||||
import android.preference.PreferenceManager
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.AAPSLoggerProduction
|
||||
import info.nightscout.androidaps.logging.L
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelperImplementation
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SPImplementation
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Module
|
||||
open class CoreModule {
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideResources(context: Context): ResourceHelper = ResourceHelperImplementation(context)
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideSharedPreferences(context: Context, resourceHelper: ResourceHelper): SP = SPImplementation(PreferenceManager.getDefaultSharedPreferences(context), resourceHelper)
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideAAPSLogger(l: L): AAPSLogger = AAPSLoggerProduction(l)
|
||||
|
||||
}
|
||||
|
|
@ -6,33 +6,30 @@ import org.slf4j.LoggerFactory
|
|||
* Created by adrian on 2019-12-27.
|
||||
*/
|
||||
|
||||
class AAPSLoggerProduction : AAPSLogger {
|
||||
class AAPSLoggerProduction constructor(val l: L) : AAPSLogger {
|
||||
|
||||
override fun debug(message: String) {
|
||||
LoggerFactory.getLogger(LTag.CORE.tag).debug(stackLogMarker() + message)
|
||||
}
|
||||
|
||||
override fun debug(enable: Boolean, tag: LTag, message: String) {
|
||||
if (enable && L.isEnabled(tag.tag)) {
|
||||
if (enable && l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
|
||||
}
|
||||
}
|
||||
|
||||
override fun debug(tag: LTag, message: String) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
if (l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + message)
|
||||
}
|
||||
}
|
||||
|
||||
override fun debug(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
if (L.isEnabled(tag.tag))
|
||||
if (l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).debug(stackLogMarker() + format, arguments)
|
||||
}
|
||||
|
||||
override fun warn(tag: LTag, message: String) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
if (l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).warn(stackLogMarker() + message)
|
||||
}
|
||||
}
|
||||
|
||||
override fun warn(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
|
|
@ -40,20 +37,17 @@ class AAPSLoggerProduction : AAPSLogger {
|
|||
}
|
||||
|
||||
override fun info(tag: LTag, message: String) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
if (l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + message)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
override fun info(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + format, arguments)
|
||||
if (l.findByName(tag.tag).enabled)
|
||||
LoggerFactory.getLogger(tag.tag).info(stackLogMarker() + format, arguments)
|
||||
}
|
||||
|
||||
override fun error(tag: LTag, message: String) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message)
|
||||
}
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message)
|
||||
}
|
||||
|
||||
override fun error(message: String) {
|
||||
|
|
@ -69,15 +63,11 @@ class AAPSLoggerProduction : AAPSLogger {
|
|||
}
|
||||
|
||||
override fun error(tag: LTag, message: String, throwable: Throwable) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message, throwable)
|
||||
}
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + message, throwable)
|
||||
}
|
||||
|
||||
override fun error(tag: LTag, format: String, vararg arguments: Any?) {
|
||||
if (L.isEnabled(tag.tag)) {
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + format, arguments)
|
||||
}
|
||||
LoggerFactory.getLogger(tag.tag).error(stackLogMarker() + format, arguments)
|
||||
}
|
||||
}
|
||||
|
||||
81
core/src/main/java/info/nightscout/androidaps/logging/L.kt
Normal file
81
core/src/main/java/info/nightscout/androidaps/logging/L.kt
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
package info.nightscout.androidaps.logging
|
||||
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
@Singleton
|
||||
class L @Inject constructor(
|
||||
private val sp: SP
|
||||
) {
|
||||
|
||||
private var logElements: MutableList<LogElement> = ArrayList()
|
||||
|
||||
companion object {
|
||||
@Deprecated("Use Dagger")
|
||||
lateinit var instance: L
|
||||
|
||||
@Deprecated("Use Dagger")
|
||||
@JvmStatic
|
||||
fun isEnabled(ltag: LTag): Boolean {
|
||||
return instance.findByName(ltag.name).enabled
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
instance= this
|
||||
LTag.values().forEach { logElements.add(LogElement(it, sp)) }
|
||||
}
|
||||
|
||||
fun findByName(name: String): LogElement {
|
||||
for (element in logElements) {
|
||||
if (element.name == name) return element
|
||||
}
|
||||
return LogElement(false, sp)
|
||||
}
|
||||
|
||||
fun getLogElements(): List<LogElement> {
|
||||
return logElements
|
||||
}
|
||||
|
||||
fun resetToDefaults() {
|
||||
for (element in logElements) {
|
||||
element.resetToDefault()
|
||||
}
|
||||
}
|
||||
|
||||
class LogElement {
|
||||
var sp : SP
|
||||
var name: String
|
||||
var defaultValue: Boolean
|
||||
var enabled: Boolean
|
||||
private var requiresRestart = false
|
||||
|
||||
internal constructor(tag: LTag, sp: SP) {
|
||||
this.sp = sp
|
||||
this.name = tag.tag
|
||||
this.defaultValue = tag.defaultValue
|
||||
this.requiresRestart = tag.requiresRestart
|
||||
enabled = sp.getBoolean(getSPName(), defaultValue)
|
||||
}
|
||||
|
||||
internal constructor(defaultValue: Boolean, sp: SP) {
|
||||
this.sp = sp
|
||||
name = "NONEXISTING"
|
||||
this.defaultValue = defaultValue
|
||||
enabled = defaultValue
|
||||
}
|
||||
|
||||
private fun getSPName(): String = "log_$name"
|
||||
|
||||
fun enable(enabled: Boolean) {
|
||||
this.enabled = enabled
|
||||
sp.putBoolean(getSPName(), enabled)
|
||||
}
|
||||
|
||||
fun resetToDefault() {
|
||||
enable(defaultValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ class StacktraceLoggerWrapper(private val delegate: Logger) : Logger by delegate
|
|||
companion object {
|
||||
@JvmStatic
|
||||
@Deprecated("please inject AAPSLogger")
|
||||
fun getLogger(name: String) = StacktraceLoggerWrapper(LoggerFactory.getLogger(name))
|
||||
fun getLogger(ltag: LTag) = StacktraceLoggerWrapper(LoggerFactory.getLogger(ltag.name))
|
||||
|
||||
@JvmStatic
|
||||
@Deprecated("please inject AAPSLogger")
|
||||
|
|
@ -10,7 +10,7 @@ import android.provider.Settings
|
|||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.core.R
|
||||
import info.nightscout.androidaps.utils.alertDialogs.OKDialog
|
||||
import info.nightscout.androidaps.utils.resources.ResourceHelper
|
||||
import javax.inject.Inject
|
||||
|
|
@ -27,7 +27,7 @@ class BlePreCheck @Inject constructor(
|
|||
|
||||
fun prerequisitesCheck(activity: AppCompatActivity): Boolean {
|
||||
if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
|
||||
OKDialog.show(activity, resourceHelper.gs(R.string.app_name), resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
|
||||
OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.rileylink_scanner_ble_not_supported))
|
||||
return false
|
||||
} else {
|
||||
// Use this check to determine whether BLE is supported on the device. Then
|
||||
|
|
@ -41,7 +41,7 @@ class BlePreCheck @Inject constructor(
|
|||
// Ensures Bluetooth is available on the device and it is enabled. If not,
|
||||
// displays a dialog requesting user permission to enable Bluetooth.
|
||||
if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled) {
|
||||
OKDialog.show(activity, resourceHelper.gs(R.string.app_name), resourceHelper.gs(R.string.rileylink_scanner_ble_not_enabled))
|
||||
OKDialog.show(activity, resourceHelper.gs(R.string.message), resourceHelper.gs(R.string.rileylink_scanner_ble_not_enabled))
|
||||
return false
|
||||
} else {
|
||||
// Will request that GPS be enabled for devices running Marshmallow or newer.
|
||||
|
|
@ -4,17 +4,11 @@ import android.content.Context
|
|||
import android.os.Bundle
|
||||
import com.crashlytics.android.Crashlytics
|
||||
import com.google.firebase.analytics.FirebaseAnalytics
|
||||
import info.nightscout.androidaps.BuildConfig
|
||||
import info.nightscout.androidaps.Config
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.interfaces.ActivePluginProvider
|
||||
import info.nightscout.androidaps.core.R
|
||||
import info.nightscout.androidaps.logging.AAPSLogger
|
||||
import info.nightscout.androidaps.logging.LTag
|
||||
import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
|
||||
import info.nightscout.androidaps.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
|
||||
import info.nightscout.androidaps.utils.sharedPreferences.SP
|
||||
import io.fabric.sdk.android.Fabric
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
|
@ -27,13 +21,10 @@ import javax.inject.Singleton
|
|||
class FabricPrivacy @Inject constructor(
|
||||
context: Context,
|
||||
private val aapsLogger: AAPSLogger,
|
||||
private val sp: SP,
|
||||
private val constraintChecker: ConstraintChecker,
|
||||
private val signatureVerifierPlugin: SignatureVerifierPlugin,
|
||||
private val activePlugin: ActivePluginProvider
|
||||
private val sp: SP
|
||||
) {
|
||||
|
||||
private var firebaseAnalytics: FirebaseAnalytics
|
||||
var firebaseAnalytics: FirebaseAnalytics
|
||||
|
||||
init {
|
||||
instance = this
|
||||
|
|
@ -49,7 +40,7 @@ class FabricPrivacy @Inject constructor(
|
|||
private lateinit var instance: FabricPrivacy
|
||||
|
||||
@JvmStatic
|
||||
@Deprecated("use dagger")
|
||||
@Deprecated("Use Dagger")
|
||||
fun getInstance(): FabricPrivacy = instance
|
||||
}
|
||||
|
||||
|
|
@ -122,31 +113,4 @@ class FabricPrivacy @Inject constructor(
|
|||
fun fabricEnabled(): Boolean {
|
||||
return sp.getBoolean(R.string.key_enable_fabric, true)
|
||||
}
|
||||
|
||||
fun setUserStats() {
|
||||
if (!fabricEnabled()) return
|
||||
val closedLoopEnabled = if (constraintChecker.isClosedLoopAllowed().value()) "CLOSED_LOOP_ENABLED" else "CLOSED_LOOP_DISABLED"
|
||||
// Size is limited to 36 chars
|
||||
val remote = BuildConfig.REMOTE.toLowerCase(Locale.getDefault())
|
||||
.replace("https://", "")
|
||||
.replace("http://", "")
|
||||
.replace(".git", "")
|
||||
.replace(".com/", ":")
|
||||
.replace(".org/", ":")
|
||||
.replace(".net/", ":")
|
||||
firebaseAnalytics.setUserProperty("Mode", BuildConfig.APPLICATION_ID + "-" + closedLoopEnabled)
|
||||
firebaseAnalytics.setUserProperty("Language", sp.getString(R.string.key_language, Locale.getDefault().language))
|
||||
firebaseAnalytics.setUserProperty("Version", BuildConfig.VERSION)
|
||||
firebaseAnalytics.setUserProperty("HEAD", BuildConfig.HEAD)
|
||||
firebaseAnalytics.setUserProperty("Remote", remote)
|
||||
val hashes: List<String> = signatureVerifierPlugin.shortHashes()
|
||||
if (hashes.isNotEmpty()) firebaseAnalytics.setUserProperty("Hash", hashes[0])
|
||||
activePlugin.activePump.let { firebaseAnalytics.setUserProperty("Pump", it::class.java.simpleName) }
|
||||
if (!Config.NSCLIENT && !Config.PUMPCONTROL)
|
||||
activePlugin.activeAPS.let { firebaseAnalytics.setUserProperty("Aps", it::class.java.simpleName) }
|
||||
activePlugin.activeBgSource.let { firebaseAnalytics.setUserProperty("BgSource", it::class.java.simpleName) }
|
||||
firebaseAnalytics.setUserProperty("Profile", activePlugin.activeProfileInterface.javaClass.simpleName)
|
||||
activePlugin.activeSensitivity.let { firebaseAnalytics.setUserProperty("Sensitivity", it::class.java.simpleName) }
|
||||
activePlugin.activeInsulin.let { firebaseAnalytics.setUserProperty("Insulin", it::class.java.simpleName) }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +1,11 @@
|
|||
package info.nightscout.androidaps.utils;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
|
||||
|
||||
/**
|
||||
* Created by mike on 23.06.2016.
|
||||
*/
|
||||
public class SafeParse {
|
||||
private static Logger log = StacktraceLoggerWrapper.getLogger(SafeParse.class);
|
||||
// TODO return logging with dagger
|
||||
// private static Logger log = StacktraceLoggerWrapper.getLogger(SafeParse.class);
|
||||
public static Double stringToDouble(String input) {
|
||||
Double result = 0d;
|
||||
input = input.replace(",", ".");
|
||||
|
|
@ -19,7 +15,7 @@ public class SafeParse {
|
|||
try {
|
||||
result = Double.parseDouble(input);
|
||||
} catch (Exception e) {
|
||||
log.error("Error parsing " + input + " to double");
|
||||
// log.error("Error parsing " + input + " to double");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -33,21 +29,21 @@ public class SafeParse {
|
|||
try {
|
||||
result = Integer.parseInt(input);
|
||||
} catch (Exception e) {
|
||||
log.error("Error parsing " + input + " to int");
|
||||
// log.error("Error parsing " + input + " to int");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Long stringToLong(String input) {
|
||||
public static Long stringToLong(String input) {
|
||||
Long result = 0L;
|
||||
input = input.replace(",", ".");
|
||||
input = input.replace("−", "-");
|
||||
if (input.equals(""))
|
||||
return 0L;
|
||||
if (input.equals(""))
|
||||
return 0L;
|
||||
try {
|
||||
result = Long.parseLong(input);
|
||||
} catch (Exception e) {
|
||||
log.error("Error parsing " + input + " to long");
|
||||
// log.error("Error parsing " + input + " to long");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ import android.widget.Toast;
|
|||
import androidx.annotation.DrawableRes;
|
||||
import androidx.appcompat.view.ContextThemeWrapper;
|
||||
|
||||
import info.nightscout.androidaps.R;
|
||||
import info.nightscout.androidaps.core.R;
|
||||
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
|
||||
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
|
||||
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
|
||||
|
|
@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes
|
|||
import androidx.annotation.StyleRes
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import androidx.appcompat.view.ContextThemeWrapper
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.core.R
|
||||
|
||||
object AlertDialogHelper {
|
||||
|
||||
|
|
@ -6,7 +6,7 @@ import android.content.Context
|
|||
import android.content.DialogInterface
|
||||
import android.os.SystemClock
|
||||
import android.text.Spanned
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.core.R
|
||||
import info.nightscout.androidaps.utils.extensions.runOnUiThread
|
||||
|
||||
object OKDialog {
|
||||
|
|
@ -5,7 +5,7 @@ import android.content.Context
|
|||
import android.content.DialogInterface
|
||||
import android.os.SystemClock
|
||||
import androidx.annotation.StringRes
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.core.R
|
||||
import info.nightscout.androidaps.utils.extensions.runOnUiThread
|
||||
|
||||
// if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead
|
||||
|
|
@ -15,8 +15,6 @@ interface ResourceHelper {
|
|||
fun gsa(@ArrayRes id:Int): Array<String>
|
||||
fun openRawResourceFd(@RawRes id : Int) : AssetFileDescriptor?
|
||||
|
||||
fun getIcon() : Int
|
||||
fun getNotificationIcon() : Int
|
||||
fun decodeResource(id : Int) : Bitmap
|
||||
fun getDisplayMetrics(): DisplayMetrics
|
||||
fun dpToPx(dp: Int): Int
|
||||
|
|
@ -12,8 +12,7 @@ import androidx.annotation.ColorRes
|
|||
import androidx.annotation.PluralsRes
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.core.content.ContextCompat
|
||||
import info.nightscout.androidaps.Config
|
||||
import info.nightscout.androidaps.R
|
||||
import info.nightscout.androidaps.core.R
|
||||
import javax.inject.Inject
|
||||
|
||||
/**
|
||||
|
|
@ -42,20 +41,6 @@ class ResourceHelperImplementation @Inject constructor(private val context: Cont
|
|||
override fun openRawResourceFd(id: Int): AssetFileDescriptor =
|
||||
context.resources.openRawResourceFd(id)
|
||||
|
||||
override fun getIcon(): Int =
|
||||
when {
|
||||
Config.NSCLIENT -> R.mipmap.ic_yellowowl
|
||||
Config.PUMPCONTROL -> R.mipmap.ic_pumpcontrol
|
||||
else -> R.mipmap.ic_launcher
|
||||
}
|
||||
|
||||
override fun getNotificationIcon(): Int =
|
||||
when {
|
||||
Config.NSCLIENT -> R.drawable.ic_notif_nsclient
|
||||
Config.PUMPCONTROL -> R.drawable.ic_notif_pumpcontrol
|
||||
else -> R.drawable.ic_notif_aaps
|
||||
}
|
||||
|
||||
override fun decodeResource(id: Int): Bitmap =
|
||||
BitmapFactory.decodeResource(context.resources, id)
|
||||
|
||||
18
core/src/main/res/values/colors.xml
Normal file
18
core/src/main/res/values/colors.xml
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#212121</color>
|
||||
<color name="colorPrimaryDark">#000000</color>
|
||||
<color name="colorAccent">#40bbaa</color>
|
||||
|
||||
<color name="dialog_title_background">#303030</color>
|
||||
<color name="activity_title_background">#121212</color>
|
||||
<color name="dialog_title_color">#FFFFFF</color>
|
||||
<color name="dialog_title_icon_tint">#FFFFFF</color>
|
||||
|
||||
<color name="warningAlertBackground">#FFFB8C00</color>
|
||||
<color name="warningAlertHeaderText">#FF000000</color>
|
||||
|
||||
<color name="errorAlertBackground">#FFFF5555</color>
|
||||
<color name="errorAlertHeaderText">#FF000000</color>
|
||||
|
||||
</resources>
|
||||
15
core/src/main/res/values/strings.xml
Normal file
15
core/src/main/res/values/strings.xml
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="key_enable_fabric" translatable="false">enable_fabric</string>
|
||||
<string name="confirmation">Confirmation</string>
|
||||
<string name="message">Message</string>
|
||||
<string name="ok">OK</string>
|
||||
<string name="cancel">Cancel</string>
|
||||
<string name="dismiss">DISMISS</string>
|
||||
|
||||
<string name="rileylink_scanner_ble_not_supported">Bluetooth Low Energy not supported.</string>
|
||||
<string name="rileylink_scanner_ble_not_enabled">Bluetooth not enabled.</string>
|
||||
<string name="location_not_found_title">Location Is Not Enabled</string>
|
||||
<string name="location_not_found_message">For Bluetooth discovery to work on newer devices, location must be enabled. AAPS does not track your location and it can be disabled after pairing is successful.</string>
|
||||
|
||||
</resources>
|
||||
38
core/src/main/res/values/styles.xml
Normal file
38
core/src/main/res/values/styles.xml
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="AppTheme" parent="Theme.AppCompat">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="dialogTitleBackground">@color/dialog_title_background</item>
|
||||
<item name="dialogTitleColor">@color/dialog_title_color</item>
|
||||
<item name="dialogTitleIconTint">@color/dialog_title_icon_tint</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialog" parent="AppTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeWarningDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/warningAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/warningAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/warningAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeWarningDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_warning</item>
|
||||
<item name="colorAccent">@color/warningAlertBackground</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialog" parent="AppTheme">
|
||||
<item name="alertDialogTheme">@style/AppThemeErrorDialogTheme</item>
|
||||
<item name="dialogTitleBackground">@color/errorAlertBackground</item>
|
||||
<item name="dialogTitleColor">@color/errorAlertHeaderText</item>
|
||||
<item name="dialogTitleIconTint">@color/errorAlertHeaderText</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeErrorDialogTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="android:windowBackground">@drawable/alert_border_error</item>
|
||||
<item name="colorAccent">@color/errorAlertBackground</item>
|
||||
</style>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
package info.nightscout.androidaps.core
|
||||
|
||||
import org.junit.Test
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* Example local unit test, which will execute on the development machine (host).
|
||||
*
|
||||
* See [testing documentation](http://d.android.com/tools/testing).
|
||||
*/
|
||||
class ExampleUnitTest {
|
||||
|
||||
@Test
|
||||
fun addition_isCorrect() {
|
||||
assertEquals(4, 2 + 2)
|
||||
}
|
||||
}
|
||||
|
|
@ -13,3 +13,5 @@ files:
|
|||
translation: /app/src/main/res/values-%android_code%/protection.xml
|
||||
- source: /app/src/main/res/values/validator.xml
|
||||
translation: /app/src/main/res/values-%android_code%/validator.xml
|
||||
- source: /core/src/main/res/values/strings.xml
|
||||
translation: /core/src/main/res/values-%android_code%/strings.xml
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
org.gradle.parallel=true
|
||||
|
||||
org.gradle.jvmargs=-Xmx2g
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
include ':app', ':wear'
|
||||
include ':app', ':wear', ':core'
|
||||
|
|
@ -123,8 +123,8 @@ dependencies {
|
|||
implementation('me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0')
|
||||
implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
|
||||
|
||||
testImplementation "junit:junit:4.12"
|
||||
testImplementation "org.json:json:20140107"
|
||||
testImplementation 'junit:junit:4.13'
|
||||
testImplementation 'org.json:json:20190722'
|
||||
testImplementation ("org.mockito:mockito-core:2.8.47") {
|
||||
exclude group: 'net.bytebuddy', module: 'byte-buddy'
|
||||
exclude group: 'net.bytebuddy', module: 'byte-buddy-android'
|
||||
|
|
@ -139,8 +139,8 @@ dependencies {
|
|||
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"
|
||||
testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}"
|
||||
testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}"
|
||||
testImplementation "joda-time:joda-time:2.9.9"
|
||||
testImplementation("com.google.truth:truth:0.39") {
|
||||
testImplementation 'joda-time:joda-time:2.10.6'
|
||||
testImplementation('com.google.truth:truth:1.0.1') {
|
||||
exclude group: "com.google.guava", module: "guava"
|
||||
}
|
||||
testImplementation "org.skyscreamer:jsonassert:1.5.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue