100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Few updates for android console
Michael Rademaker58bbf25b9c7f
diff --git a/console/android/build.gradle b/console/android/build.gradleindex 8f73d84aa..c2db2a86d 100644--- a/console/android/build.gradle+++ b/console/android/build.gradle@@ -5,16 +5,15 @@ apply plugin: 'kotlin-android'version = projectVersionandroid {- compileSdkVersion Integer.valueOf(androidCompileVersion)+ compileSdkVersion androidCompileVersionbuildToolsVersion androidBuildToolsVersiondefaultConfig {- minSdkVersion Integer.valueOf(androidMinVersion)- targetSdkVersion Integer.valueOf(androidTargetVersion)+ minSdkVersion androidMinVersion+ targetSdkVersion androidTargetVersionversionCode Integer.valueOf(projectVersionCode)versionName project.version-}packagingOptions {@@ -38,7 +37,6 @@ android {buildTypes {}- buildToolsVersion '28.0.3'}dependencies {@@ -46,7 +44,7 @@ dependencies {implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"implementation "com.android.support:support-compat:$androidSupportVersion"implementation "com.android.support:appcompat-v7:$androidSupportVersion"- implementation "com.google.firebase:firebase-core:$fcmVersion"+ implementation "com.google.firebase:firebase-core:$firebaseCoreVersion"implementation "com.google.firebase:firebase-messaging:$fcmVersion"implementation "com.squareup.retrofit2:converter-jackson:$jacksonVersion"implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"diff --git a/console/android/gradle.properties b/console/android/gradle.propertiesindex 4a3e59e38..63d109971 100644--- a/console/android/gradle.properties+++ b/console/android/gradle.properties@@ -4,18 +4,3 @@ projectVersion = 3.0-SNAPSHOT# Increment this for every releaseprojectVersionCode = 1--# Android 5.0-androidMinVersion = 21-androidTargetVersion = 25--androidGradleVersion = 2.2.3-androidBuildToolsVersion = 27.0.3-androidCompileVersion = 26-androidSupportVersion = 26.1.0--okhttp3Version = 3.6.0-retrofitVersion = 2.2.0-googlePlayVersion = 15.0.1-fcmVersion = 15.0.2-jacksonVersion = 2.2.0diff --git a/console/android/src/main/java/org/openremote/android/ORMessagingActionService.java b/console/android/src/main/java/org/openremote/android/ORMessagingActionService.javaindex 4211a3a1e..96e07d1cb 100644--- a/console/android/src/main/java/org/openremote/android/ORMessagingActionService.java+++ b/console/android/src/main/java/org/openremote/android/ORMessagingActionService.java@@ -62,7 +62,7 @@ public class ORMessagingActionService extends IntentService {// Do silent HTTP requesttokenService.executeRequest(httpMethod, appUrl, data);} else {- Intent activityIntent = new Intent(this, MainActivity.class);+ Intent activityIntent = new Intent("android.intent.action.MAIN");activityIntent.setAction(Intent.ACTION_MAIN);activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK |diff --git a/console/android/src/main/java/org/openremote/android/service/GeofenceProvider.kt b/console/android/src/main/java/org/openremote/android/service/GeofenceProvider.ktindex 29528c6a7..63c2136d8 100644--- a/console/android/src/main/java/org/openremote/android/service/GeofenceProvider.kt+++ b/console/android/src/main/java/org/openremote/android/service/GeofenceProvider.kt@@ -128,7 +128,7 @@ class GeofenceProvider(val context: Context) : ActivityCompat.OnRequestPermissio}val version = "ORConsole"- val geofenceFetchEndpoint = "api/rules/geofences/"+ val geofenceFetchEndpoint = "rules/geofences/"private val geofencingClient: GeofencingClient by lazy {LocationServices.getGeofencingClient(context)@@ -142,9 +142,9 @@ class GeofenceProvider(val context: Context) : ActivityCompat.OnRequestPermissio"provider" to "geofence","version" to version,"requiresPermission" to true,- "enabled" to (ContextCompat.checkSelfPermission(context, ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED),"hasPermission" to (ContextCompat.checkSelfPermission(context, ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED),- "success" to true+ "success" to true,+ "enabled" to false)}diff --git a/console/android/src/main/res/layout/activity_web.xml b/console/android/src/main/res/layout/activity_web.xmlindex 5b2afff63..b38c039c1 100644--- a/console/android/src/main/res/layout/activity_web.xml+++ b/console/android/src/main/res/layout/activity_web.xml@@ -15,6 +15,6 @@android:layout_alignParentEnd="true"></WebView>- <include layout="@layout/error_layout"></include>- <include layout="@layout/error_layout"></include>++ <include layout="@layout/error_layout"/></RelativeLayout>