Merge pull request #78 from SUPLA/develop

v2.3.10
SUPLA · Jul 1, 2019 · d4bbba2 · d4bbba2
2 parents bd59858 + f91489b
commit d4bbba2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 62
-        versionName "2.3.9"
+        versionCode 63
+        versionName "2.3.10"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/Trace.java b/app/src/main/java/org/supla/android/Trace.java
@@ -10,7 +10,7 @@ public class Trace
     public static final int    ERRORS_WARNINGS_INFO         = 3;
     public static final int    ERRORS_WARNINGS_INFO_DEBUG   = 4;
 
-    private static final int  LOGGING_LEVEL = ERRORS_ONLY; /*ERRORS_WARNINGS_INFO_DEBUG;*/
+    private static final int  LOGGING_LEVEL = /*ERRORS_ONLY;*/ ERRORS_WARNINGS_INFO_DEBUG;
 
     public static void e(String tag, String msg)
     {

diff --git a/app/src/main/java/org/supla/android/lib/SuplaOAuthToken.java b/app/src/main/java/org/supla/android/lib/SuplaOAuthToken.java
@@ -69,6 +69,10 @@ public URL getUrl() {
             return Url;
         }
 
+        if (Token == null) {
+            return null;
+        }
+
         String[] t = Token.split("\\.");
         if (t.length > 1) {
             byte [] data = Base64.decode(t[t.length-1], Base64.DEFAULT);

diff --git a/app/src/main/java/org/supla/android/restapi/DownloadIncrementalMeasurements.java b/app/src/main/java/org/supla/android/restapi/DownloadIncrementalMeasurements.java
@@ -50,7 +50,7 @@ protected void SaveMeasurementItem(SQLiteDatabase db,
 
             IncrementalMeasurementItem citem = newObject(younger_item);
 
-            if (older_item.getTimestamp() < citem.getTimestamp() && !citem.isCalculated())  {
+            if (!citem.isCalculated())  {
                 citem.Calculate(older_item);
             }
 
@@ -86,6 +86,7 @@ protected void noRemoteDataAvailable(SQLiteDatabase db) throws JSONException {
         if (older_item != null
                 && added) {
             addIncrementalMeasurement(db, older_item);
+            older_item = null;
         }
     }
 

diff --git a/app/src/main/res/layout-hdpi/activity_status.xml b/app/src/main/res/layout-hdpi/activity_status.xml
@@ -30,12 +30,12 @@
     <TextView
         android:id="@+id/status_text"
         android:layout_width="match_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:layout_below="@+id/status_img"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:layout_marginTop="38dp"
+        android:layout_marginRight="10dp"
         android:gravity="center_vertical|center_horizontal"
         android:text="@string/status_connecting"
         android:textColor="@android:color/black"

diff --git a/app/src/main/res/layout-xhdpi/activity_status.xml b/app/src/main/res/layout-xhdpi/activity_status.xml
@@ -30,12 +30,12 @@
     <TextView
         android:id="@+id/status_text"
         android:layout_width="match_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:layout_below="@+id/status_img"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:layout_marginTop="38dp"
+        android:layout_marginRight="10dp"
         android:gravity="center_vertical|center_horizontal"
         android:text="@string/status_connecting"
         android:textColor="@android:color/black"

diff --git a/app/src/main/res/layout/activity_status.xml b/app/src/main/res/layout/activity_status.xml
@@ -30,12 +30,12 @@
     <TextView
         android:id="@+id/status_text"
         android:layout_width="match_parent"
-        android:layout_height="110dp"
+        android:layout_height="120dp"
         android:layout_below="@+id/status_img"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:layout_marginTop="15dp"
+        android:layout_marginRight="10dp"
         android:gravity="center_vertical|center_horizontal"
         android:text="@string/status_connecting"
         android:textColor="@android:color/black"

diff --git a/app/src/main/res/layout/add_wizard_error.xml b/app/src/main/res/layout/add_wizard_error.xml
@@ -12,8 +12,8 @@
         android:layout_below="@+id/imageView3"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="10dp"
+        android:layout_marginTop="50dp"
         android:layout_marginRight="10dp"
-        android:layout_marginTop="70dp"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         android:textSize="15sp" />