Merge branch 'master' into bip-wip

CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Changelog
 
+#### Version 0.25.1
+* Amazfit Cor: Try to send weather location instead of AQI
+* Amazfit Bip: Support setting start end end time for background light when lifting the arm
+* Pebble: various fixes and improvemnets for background javascript
+* Explicity ask for RECEIVE_SMS permission to fix problems with Android 8
+
 #### Version 0.25.0
 * Inital suport for Xwatch
 * Move the connected device to top in control center

app/build.gradle

@@ -1,14 +1,13 @@
+apply plugin: "com.android.application"
+apply plugin: "findbugs"
+apply plugin: "pmd"
 
-apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
-apply plugin: 'pmd'
-
-def ABORT_ON_CHECK_FAILURE=false
+def ABORT_ON_CHECK_FAILURE = false
 
 tasks.withType(Test) {
-    systemProperty 'MiFirmwareDir', System.getProperty('MiFirmwareDir', null)
-    systemProperty 'logback.configurationFile', System.getProperty('user.dir', null) + '/app/src/main/assets/logback.xml'
-    systemProperty 'GB_LOGFILES_DIR', java.nio.file.Files.createTempDirectory('gblog').toString();
+    systemProperty "MiFirmwareDir", System.getProperty("MiFirmwareDir", null)
+    systemProperty "logback.configurationFile", System.getProperty("user.dir", null) + "/app/src/main/assets/logback.xml"
+    systemProperty "GB_LOGFILES_DIR", java.nio.file.Files.createTempDirectory("gblog").toString()
 }
 
 android {
@@ -18,111 +17,114 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "nodomain.freeyourgadget.gadgetbridge"
         minSdkVersion 19
         targetSdkVersion 27
 
-        // note: always bump BOTH versionCode and versionName!
-        versionName "0.25.0"
-        versionCode 124
+        // Note: always bump BOTH versionCode and versionName!
+        versionName "0.25.1"
+        versionCode 125
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 
     lintOptions {
         abortOnError ABORT_ON_CHECK_FAILURE
         lintConfig file("${project.rootDir}/config/lint/lint.xml")
-
-// if true, generate an HTML report (with issue explanations, sourcecode, etc)
+// If true, generate an HTML report (with issue explanations, sourcecode, etc)
         htmlReport true
-// optional path to report (default will be lint-results.html in the builddir)
+// Optional path to report (default will be lint-results.html in the builddir)
         htmlOutput file("$project.buildDir/reports/lint/lint.html")
     }
 
     testOptions {
-        unitTests.returnDefaultValues = true
+        unitTests {
+            returnDefaultValues = true
+            includeAndroidResources = true
+        }
     }
 }
 
 pmd {
-    toolVersion = '5.5.5'
+    toolVersion = "5.5.5"
 }
 
 dependencies {
-//    testCompile 'ch.qos.logback:logback-classic:1.1.3'
-//    testCompile 'ch.qos.logback:logback-core:1.1.3'
-    testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:1.10.19"
-    testCompile "org.robolectric:robolectric:3.5.1"
-
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:cardview-v7:27.0.2'
-    compile 'com.android.support:recyclerview-v7:27.0.2'
-    compile 'com.android.support:support-v4:27.0.2'
-    compile 'com.android.support:gridlayout-v7:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    compile 'com.android.support:palette-v7:27.0.2'
-    compile('com.github.tony19:logback-android-classic:1.1.1-6') {
-        exclude group: 'com.google.android', module: 'android'
+//    testImplementation "ch.qos.logback:logback-classic:1.1.3"
+//    testImplementation "ch.qos.logback:logback-core:1.1.3"
+    testImplementation "junit:junit:4.12"
+    testImplementation "org.mockito:mockito-core:1.10.19"
+    testImplementation "org.robolectric:robolectric:3.6.1"
+
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:27.0.2"
+    implementation "com.android.support:cardview-v7:27.0.2"
+    implementation "com.android.support:recyclerview-v7:27.0.2"
+    implementation "com.android.support:support-v4:27.0.2"
+    implementation "com.android.support:gridlayout-v7:27.0.2"
+    implementation "com.android.support:design:27.0.2"
+    implementation "com.android.support:palette-v7:27.0.2"
+    implementation("com.github.tony19:logback-android-classic:1.1.1-6") {
+        exclude group: "com.google.android", module: "android"
     }
-    compile 'org.slf4j:slf4j-api:1.7.12'
-    compile 'com.github.Freeyourgadget:MPAndroidChart:5e5bd6c1d3e95c515d4853647ae554e48ee1d593'
-    compile 'com.github.pfichtner:durationformatter:0.1.1'
-    compile 'de.cketti.library.changelog:ckchangelog:1.2.2'
-    compile 'net.e175.klaus:solarpositioning:0.0.9'
+    implementation "org.slf4j:slf4j-api:1.7.12"
+    implementation "com.github.Freeyourgadget:MPAndroidChart:5e5bd6c1d3e95c515d4853647ae554e48ee1d593"
+    implementation "com.github.pfichtner:durationformatter:0.1.1"
+    implementation "de.cketti.library.changelog:ckchangelog:1.2.2"
+    implementation "net.e175.klaus:solarpositioning:0.0.9"
     // use pristine greendao instead of our custom version, since our custom jitpack-packaged
     // version contains way too much and our custom patches are in the generator only.
-    compile 'org.greenrobot:greendao:2.2.1'
-    compile 'org.apache.commons:commons-lang3:3.5'
-    compile 'org.cyanogenmod:platform.sdk:6.0'
+    implementation "org.greenrobot:greendao:2.2.1"
+    implementation "org.apache.commons:commons-lang3:3.5"
+    implementation "org.cyanogenmod:platform.sdk:6.0"
 
-//    compile project(":DaoCore")
+//    implementation project(":DaoCore")
 }
 
 preBuild.dependsOn(":GBDaoGenerator:genSources")
+
 gradle.beforeProject {
     preBuild.dependsOn(":GBDaoGenerator:genSources")
 }
 
-check.dependsOn 'findbugs', 'pmd', 'lint'
+check.dependsOn "findbugs", "pmd", "lint"
 
 task pmd(type: Pmd) {
     ruleSetFiles = files("${project.rootDir}/config/pmd/pmd-ruleset.xml")
     ignoreFailures = !ABORT_ON_CHECK_FAILURE
     ruleSets = [
-            'java-android',
-            'java-basic',
-            'java-braces',
-            'java-clone',
-            'java-codesize',
-            'java-controversial',
-            'java-coupling',
-            'java-design',
-            'java-empty',
-            'java-finalizers',
-            'java-imports',
-            'java-junit',
-            'java-optimizations',
-            'java-strictexception',
-            'java-strings',
-            'java-sunsecure',
-            'java-typeresolution',
-            'java-unnecessary',
-            'java-unusedcode'
+            "java-android",
+            "java-basic",
+            "java-braces",
+            "java-clone",
+            "java-codesize",
+            "java-controversial",
+            "java-coupling",
+            "java-design",
+            "java-empty",
+            "java-finalizers",
+            "java-imports",
+            "java-junit",
+            "java-optimizations",
+            "java-strictexception",
+            "java-strings",
+            "java-sunsecure",
+            "java-typeresolution",
+            "java-unnecessary",
+            "java-unusedcode"
     ]
 
-    source 'src'
-    include '**/*.java'
-    exclude '**/gen/**'
+    source "src"
+    include "**/*.java"
+    exclude "**/gen/**"
 
     reports {
         xml.enabled = false
@@ -142,7 +144,7 @@ task findbugs(type: FindBugs) {
     reportLevel = "medium"
     excludeFilter = new File("${project.rootDir}/config/findbugs/findbugs-filter.xml")
     classes = files("${project.rootDir}/app/build/intermediates/classes")
-    source = fileTree('src/main/java/')
+    source = fileTree("src/main/java/")
     classpath = files()
     reports {
         xml.enabled = false

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/LockHandler.java

@@ -24,7 +24,7 @@
 import nodomain.freeyourgadget.gadgetbridge.entities.DaoSession;
 
 /**
- * Provides lowlevel access to the database.
+ * Provides low-level access to the database.
  */
 public class LockHandler implements DBHandler {
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java

@@ -309,6 +309,8 @@ private void checkAndRequestPermissions() {
             wantedPermissions.add(Manifest.permission.READ_PHONE_STATE);
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.PROCESS_OUTGOING_CALLS) == PackageManager.PERMISSION_DENIED)
             wantedPermissions.add(Manifest.permission.PROCESS_OUTGOING_CALLS);
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.RECEIVE_SMS) == PackageManager.PERMISSION_DENIED)
+            wantedPermissions.add(Manifest.permission.RECEIVE_SMS);
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_DENIED)
             wantedPermissions.add(Manifest.permission.READ_SMS);
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.SEND_SMS) == PackageManager.PERMISSION_DENIED)

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ExternalPebbleJSActivity.java

@@ -34,19 +34,26 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
 import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.R;
+import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceService;
+import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
+import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.GBChromeClient;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.GBWebClient;
 import nodomain.freeyourgadget.gadgetbridge.service.devices.pebble.webview.JSInterface;
+import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.WebViewSingleton;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_CONNECT;
+
 public class ExternalPebbleJSActivity extends AbstractGBActivity {
 
     private static final Logger LOG = LoggerFactory.getLogger(ExternalPebbleJSActivity.class);
@@ -64,24 +71,69 @@ public class ExternalPebbleJSActivity extends AbstractGBActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bundle extras = getIntent().getExtras();
+
+        boolean showConfig = false;
+
+        UUID currentUUID = null;
+        GBDevice currentDevice = null;
+
         if (extras == null) {
-            throw new IllegalArgumentException("Must provide device and uuid in extras when invoking this activity");
-        }
+            confUri = getIntent().getData();
+            if(confUri.getScheme().equals("gadgetbridge")) {
+                try {
+                    currentUUID = UUID.fromString(confUri.getHost());
+                } catch (IllegalArgumentException e) {
+                    LOG.error("UUID in incoming configuration is not a valid UUID: " +confUri.toString());
+                }
+
+                //first check if we are still connected to a pebble
+                DeviceManager deviceManager = ((GBApplication) getApplication()).getDeviceManager();
+                List<GBDevice> deviceList = deviceManager.getDevices();
+                for (GBDevice device : deviceList) {
+                    if (device.getState() == GBDevice.State.INITIALIZED) {
+                        if (device.getType().equals(DeviceType.PEBBLE)) {
+                            currentDevice = device;
+                            break;
+                        } else {
+                            LOG.error("attempting to load pebble configuration but a different device type is connected!!!");
+                            finish();
+                            return;
+                        }
+                    }
+                }
+                if (currentDevice == null) {
+                    //then try to reconnect to last connected device
+                    String btDeviceAddress = GBApplication.getPrefs().getPreferences().getString("last_device_address", null);
+                    if (btDeviceAddress != null) {
+                        GBDevice candidate = DeviceHelper.getInstance().findAvailableDevice(btDeviceAddress, this);
+                        if(!candidate.isConnected() && candidate.getType() == DeviceType.PEBBLE){
+                            Intent intent = new Intent(this, DeviceCommunicationService.class)
+                                    .setAction(ACTION_CONNECT)
+                                    .putExtra(GBDevice.EXTRA_DEVICE, currentDevice);
+                            this.startService(intent);
+                            currentDevice = candidate;
+                        }
+                    }
+                }
+
+                showConfig = true; //we are getting incoming configuration data
+            }
+        } else {
+            currentDevice = extras.getParcelable(GBDevice.EXTRA_DEVICE);
+            currentUUID = (UUID) extras.getSerializable(DeviceService.EXTRA_APP_UUID);
 
-        if (extras.getBoolean(START_BG_WEBVIEW, false)) {
-            startBackgroundWebViewAndFinish();
-            return;
+            if (extras.getBoolean(START_BG_WEBVIEW, false)) {
+                startBackgroundWebViewAndFinish();
+                return;
+            }
+            showConfig = extras.getBoolean(SHOW_CONFIG, false);
         }
 
-        GBDevice currentDevice = extras.getParcelable(GBDevice.EXTRA_DEVICE);
-        UUID currentUUID = (UUID) extras.getSerializable(DeviceService.EXTRA_APP_UUID);
-
         if (GBApplication.getGBPrefs().isBackgroundJsEnabled()) {
-            if (extras.getBoolean(SHOW_CONFIG, false)) {
+            if (showConfig) {
                 Objects.requireNonNull(currentDevice, "Must provide a device when invoking this activity");
                 Objects.requireNonNull(currentUUID, "Must provide a uuid when invoking this activity");
-
-                WebViewSingleton.runJavascriptInterface(currentDevice, currentUUID);
+                WebViewSingleton.getInstance().runJavascriptInterface(this, currentDevice, currentUUID);
             }
 
             // FIXME: is this really supposed to be outside the check for SHOW_CONFIG?
@@ -104,7 +156,7 @@ private void startBackgroundWebViewAndFinish() {
 
     private void setupBGWebView() {
         setContentView(R.layout.activity_external_pebble_js);
-        myWebView = WebViewSingleton.getWebView(this);
+        myWebView = WebViewSingleton.getInstance().getWebView(this);
         if (myWebView.getParent() != null) {
             ((ViewGroup) myWebView.getParent()).removeView(myWebView);
         }
@@ -161,6 +213,7 @@ protected void onResume() {
             } catch (IllegalArgumentException e) {
                 GB.toast("returned uri: " + confUri.toString(), Toast.LENGTH_LONG, GB.ERROR);
             }
+            myWebView.stopLoading();
             myWebView.loadUrl("file:///android_asset/app_config/configure.html?" + queryString);
         }
     }

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/ActivateDisplayOnLift.java

@@ -0,0 +1,23 @@
+/*  Copyright (C) 2017-2018 José Rebelo
+
+    This file is part of Gadgetbridge.
+
+    Gadgetbridge is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Gadgetbridge is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+package nodomain.freeyourgadget.gadgetbridge.devices.huami;
+
+public enum ActivateDisplayOnLift {
+    ON,
+    OFF,
+    SCHEDULED
+}