From 42ceaac0f7ddde283e608dd7b0df1a1182f15762 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sat, 1 Jun 2019 22:29:57 +0200 Subject: [PATCH] remove activeandroid --- app/build.gradle | 1 - .../eveningoutpost/dexdrip/Models/BloodTest.java | 14 +------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d2e5a3ff7f..b9acadd2af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -279,7 +279,6 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" // xDrip-plus port - implementation 'com.activeandroid:thread-safe-active-android:3.1.1' implementation 'com.squareup.retrofit2:retrofit:2.4.0' implementation 'com.squareup.okhttp3:okhttp:3.10.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0' diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java b/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java index a106e8e48a..bd8d80dd65 100644 --- a/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java +++ b/app/src/main/java/com/eveningoutpost/dexdrip/Models/BloodTest.java @@ -1,18 +1,12 @@ package com.eveningoutpost.dexdrip.Models; -import android.provider.BaseColumns; - -import com.activeandroid.Model; -import com.activeandroid.annotation.Column; -import com.activeandroid.annotation.Table; import com.google.gson.annotations.Expose; /** * Created by jamorham on 11/12/2016. */ -@Table(name = "BloodTest", id = BaseColumns._ID) -public class BloodTest extends Model { +public class BloodTest { public static final long STATE_VALID = 1 << 0; public static final long STATE_CALIBRATION = 1 << 1; @@ -27,27 +21,21 @@ public class BloodTest extends Model { private final static boolean d = false; @Expose - @Column(name = "timestamp", unique = true, onUniqueConflicts = Column.ConflictAction.IGNORE) public long timestamp; @Expose - @Column(name = "mgdl") public double mgdl; @Expose - @Column(name = "created_timestamp") public long created_timestamp; @Expose - @Column(name = "state") public long state; // bitfield @Expose - @Column(name = "source") public String source; @Expose - @Column(name = "uuid", unique = true, onUniqueConflicts = Column.ConflictAction.IGNORE) public String uuid; /*