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
Android console updates to work with latest UI console component
Rich Turnera85db81e86f5
diff --git a/console/android/build.gradle b/console/android/build.gradleindex 7b580dce1..8f73d84aa 100644--- a/console/android/build.gradle+++ b/console/android/build.gradle@@ -44,9 +44,9 @@ android {dependencies {implementation "com.squareup.okhttp3:okhttp:$okhttp3Version"implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"- api "com.android.support:support-compat:$androidSupportVersion"- api "com.android.support:appcompat-v7:$androidSupportVersion"- api "com.google.firebase:firebase-core:$fcmVersion"+ 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-messaging:$fcmVersion"implementation "com.squareup.retrofit2:converter-jackson:$jacksonVersion"implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"diff --git a/console/android/src/main/java/org/openremote/android/MainActivity.java b/console/android/src/main/java/org/openremote/android/MainActivity.javaindex 27463e12c..a19f57a63 100644--- a/console/android/src/main/java/org/openremote/android/MainActivity.java+++ b/console/android/src/main/java/org/openremote/android/MainActivity.java@@ -38,6 +38,7 @@ import org.openremote.android.service.TokenService;import java.util.HashMap;import java.util.Map;import java.util.Objects;+import java.util.logging.Level;import java.util.logging.Logger;public class MainActivity extends Activity {@@ -55,7 +56,6 @@ public class MainActivity extends Activity {protected int webViewTimeout = WEBVIEW_LOAD_TIMEOUT_DEFAULT;protected boolean webViewLoaded;protected ErrorViewHolder errorViewHolder;- protected Context context;protected SharedPreferences sharedPreferences;protected GeofenceProvider geofenceProvider;protected String consoleId;@@ -112,7 +112,7 @@ public class MainActivity extends Activity {String version = "N/A";try {- PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);+ PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);version = pInfo.versionName;} catch (PackageManager.NameNotFoundException e) {e.printStackTrace();@@ -135,6 +135,8 @@ public class MainActivity extends Activity {protected void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);+ sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);+if (BuildConfig.DEBUG) {// Check write permission for logging purposes@@ -154,9 +156,6 @@ public class MainActivity extends Activity {System.out.println("Could not parse console load timeout value: " + nfe);}- context = this;- sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);-// Enable remote debugging of WebView from Chrome Debugger toolsif (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {LOG.info("Enabling remote debugging");@@ -293,11 +292,11 @@ public class MainActivity extends Activity {request.getUrl().getLastPathSegment().equals("token") &&request.getMethod().equals("POST") &&errorResponse.getStatusCode() == 400) {- webAppInterface.tokenService.clearToken();- return;- }+ MainActivity.this.storeData(getString(R.string.SHARED_PREF_REFRESH_TOKEN), null);+ return;+ }- handleError(errorResponse.getStatusCode(), errorResponse.getReasonPhrase(), request.getUrl().toString(), request.isForMainFrame());+ handleError(errorResponse.getStatusCode(), errorResponse.getReasonPhrase(), request.getUrl().toString(), request.isForMainFrame());}@Override@@ -412,9 +411,9 @@ public class MainActivity extends Activity {public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {String writePermission = Manifest.permission.WRITE_EXTERNAL_STORAGE;- if (ContextCompat.checkSelfPermission(context, writePermission) != PackageManager.PERMISSION_GRANTED) {+ if (ContextCompat.checkSelfPermission(MainActivity.this, writePermission) != PackageManager.PERMISSION_GRANTED) {// Write permission has not been granted yet, request it.- ActivityCompat.requestPermissions((MainActivity) context, new String[]{writePermission}, WRITE_PERMISSION_FOR_DOWNLOAD);+ ActivityCompat.requestPermissions(MainActivity.this, new String[]{writePermission}, WRITE_PERMISSION_FOR_DOWNLOAD);} else {DownloadManager.Request request = newDownloadManager.Request(Uri.parse(url));@@ -477,28 +476,15 @@ public class MainActivity extends Activity {this.webView = webView;}- @JavascriptInterface- public void logOut() {- tokenService.clearToken();- }-@JavascriptInterfacepublic void postMessage(String jsonMessage) throws JSONException {JSONObject reader = new JSONObject(jsonMessage);String messageType = reader.getString("type");JSONObject data = reader.optJSONObject("data");switch (messageType) {- case "token":- LOG.fine("Received WebApp message, storing offline refresh token");- tokenService.saveToken(data.getString("refreshToken"));- break;- case "logout":- LOG.fine("Received WebApp message, logout");- tokenService.clearToken();- break;case "error":LOG.fine("Received WebApp message, error: " + data.getString("error"));- Handler mainHandler = new Handler(context.getMainLooper());+ Handler mainHandler = new Handler(getMainLooper());mainHandler.post(new Runnable() {@Overridepublic void run() {@@ -511,9 +497,11 @@ public class MainActivity extends Activity {if (action != null) {String provider = data.getString("provider");if (provider.equalsIgnoreCase("geofence")) {- handleGeofenceProviderMessage(action, data.has("data") ? data.getJSONObject("data") : null);+ handleGeofenceProviderMessage(data);} else if (provider.equalsIgnoreCase("push")) {- handlePushProviderMessage(action, data.has("data") ? data.getJSONObject("data") : null);+ handlePushProviderMessage(data);+ } else if (provider.equalsIgnoreCase("storage")) {+ handleStorageProviderMessage(data);}}break;@@ -521,7 +509,9 @@ public class MainActivity extends Activity {}}- protected void handleGeofenceProviderMessage(String action, JSONObject data) throws JSONException {+ protected void handleGeofenceProviderMessage(JSONObject data) throws JSONException {+ String action = data.getString("action");+if (geofenceProvider == null) {geofenceProvider = new GeofenceProvider(activity);}@@ -530,21 +520,20 @@ public class MainActivity extends Activity {Map<String, Object> initData = geofenceProvider.initialize();notifyClient(initData);} else if (action.equalsIgnoreCase("PROVIDER_ENABLE")) {- if (data != null) {- String consoleId = data.getString("consoleId");- if (consoleId != null) {- ((MainActivity) activity).consoleId = consoleId;- geofenceProvider.enable(MainActivity.this, String.format("%s/api/%s",- getString(R.string.OR_BASE_SERVER),- getString(R.string.OR_REALM)),- consoleId, new GeofenceProvider.EnableCallback() {- @Override- public void accept(@NotNull Map<String, ?> responseData) {- //noinspection unchecked- notifyClient((Map<String, Object>) responseData);- }- });- }+ String consoleId = data.getString("consoleId");++ if (consoleId != null) {+ ((MainActivity) activity).consoleId = consoleId;+ geofenceProvider.enable(MainActivity.this, String.format("%s/api/%s",+ getString(R.string.OR_BASE_SERVER),+ getString(R.string.OR_REALM)),+ consoleId, new GeofenceProvider.EnableCallback() {+ @Override+ public void accept(@NotNull Map<String, ?> responseData) {+ //noinspection unchecked+ notifyClient((Map<String, Object>) responseData);+ }+ });}} else if (action.equalsIgnoreCase("PROVIDER_DISABLE")) {geofenceProvider.disable();@@ -557,24 +546,26 @@ public class MainActivity extends Activity {}}- protected void handlePushProviderMessage(String action, JSONObject data) throws JSONException {+ protected void handlePushProviderMessage(JSONObject data) throws JSONException {+ String action = data.getString("action");+if (action.equalsIgnoreCase("PROVIDER_INIT")) {// Push permission is covered by the INTERNET permission and is not a runtime permissionMap<String, Object> response = new HashMap<>();response.put("action", "PROVIDER_INIT");response.put("provider", "push");response.put("version", "fcm");+ response.put("enabled", false);response.put("requiresPermission", false);+ response.put("hasPermission", true);response.put("success", true);notifyClient(response);} else if (action.equalsIgnoreCase("PROVIDER_ENABLE")) {- if (data != null) {- String consoleId = data.getString("consoleId");- if (consoleId != null) {- sharedPreferences.edit().putString(GeofenceProvider.Companion.getConsoleIdKey(), consoleId).apply();- }- }+ String consoleId = data.getString("consoleId");+ if (consoleId != null) {+ sharedPreferences.edit().putString(GeofenceProvider.Companion.getConsoleIdKey(), consoleId).apply();+ }// TODO: Implement topic supportString fcmToken = FirebaseInstanceId.getInstance().getToken();Map<String, Object> response = new HashMap<>();@@ -595,32 +586,81 @@ public class MainActivity extends Activity {}}- protected void notifyClient(Map<String, Object> data) {- try {- final String jsonString = new ObjectMapper().writeValueAsString(data);+ protected void handleStorageProviderMessage(JSONObject data) throws JSONException {+ String action = data.getString("action");- activity.runOnUiThread(new Runnable() {- @Override- public void run() {- webView.evaluateJavascript(String.format("OpenRemoteConsole.handleProviderResponse('%s')", jsonString), null);- }- });- } catch (JsonProcessingException e) {- e.printStackTrace();+ if (action.equalsIgnoreCase("PROVIDER_INIT")) {+ Map<String, Object> response = new HashMap<>();+ response.put("action", "PROVIDER_INIT");+ response.put("provider", "storage");+ response.put("version", "1.0.0");+ response.put("enabled", true);+ response.put("requiresPermission", false);+ response.put("hasPermission", true);+ response.put("success", true);+ notifyClient(response);+ } else if (action.equalsIgnoreCase("PROVIDER_ENABLE")) {+ // Doesn't require enabling but just in case it gets called lets return a valid response+ Map<String, Object> response = new HashMap<>();+ response.put("action", "PROVIDER_ENABLE");+ response.put("provider", "storage");+ response.put("hasPermission", true);+ response.put("success", true);+ notifyClient(response);+ } else if (action.equalsIgnoreCase("STORE")) {+ try {+ String key = data.getString("key");+ String valueJson = data.getString("value");+ storeData(key, valueJson);+ } catch (JSONException e) {+ LOG.log(Level.SEVERE, "Failed to store data", e);+ }+ } else if (action.equalsIgnoreCase("RETRIEVE")) {+ try {+ String key = data.getString("key");+ String dataJson = retrieveData(key);+ Map<String, Object> response = new HashMap<>();+ response.put("action", "RETRIEVE");+ response.put("provider", "storage");+ response.put("key", key);+ response.put("value", dataJson);+ notifyClient(response);+ } catch (JSONException e) {+ LOG.log(Level.SEVERE, "Failed to retrieve data", e);+ }}}+ }- @JavascriptInterface- public String getMessage(String messageKey) {- switch (messageKey) {- case "token":- return tokenService.getJsonToken();- default:- return "{}";- }+ protected void notifyClient(Map<String, Object> data) {+ try {+ final String jsonString = new ObjectMapper().writeValueAsString(data);++ runOnUiThread(new Runnable() {+ @Override+ public void run() {+ webView.evaluateJavascript(String.format("OpenRemoteConsole._handleProviderResponse('%s')", jsonString), null);+ }+ });+ } catch (JsonProcessingException e) {+ e.printStackTrace();}}+ protected void storeData(String key, String data) {+ SharedPreferences.Editor editor = sharedPreferences.edit();+ if (data == null) {+ editor.remove(key);+ } else {+ editor.putString(key, data);+ }+ editor.apply();+ }++ protected String retrieveData(String key) {+ return sharedPreferences.getString(key, null);+ }+protected void onConnectivityChanged(boolean connectivity) {LOG.info("Connectivity changed: " + connectivity);// TODO Should check if about:blank && connectivity == true, otherwise no reload necessarydiff --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 c0dd3229d..29528c6a7 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@@ -142,6 +142,7 @@ 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)@@ -186,34 +187,38 @@ class GeofenceProvider(val context: Context) : ActivityCompat.OnRequestPermissioval url = "${getBaseUrl(context)}/$geofenceFetchEndpoint${getConsoleId(context)}"LOG.info("Fetching geofences from server: ${url}")- val geofencesJson = URL(url).readText()- val geofences = JSON.readValue(geofencesJson, Array<GeofenceDefinition>::class.java)+ try {+ val geofencesJson = URL(url).readText()+ val geofences = JSON.readValue(geofencesJson, Array<GeofenceDefinition>::class.java)- LOG.info("Fetched geofences=${geofences.size}")+ LOG.info("Fetched geofences=${geofences.size}")- // Remove previous fences that no longer exist- val oldFences = getGeofences(context)- val remainingFences : ArrayList<GeofenceProvider.GeofenceDefinition> = arrayListOf()+ // Remove previous fences that no longer exist+ val oldFences = getGeofences(context)+ val remainingFences: ArrayList<GeofenceProvider.GeofenceDefinition> = arrayListOf()- oldFences.forEach { oldFence ->- if (geofences.none { Objects.equals(it.id, oldFence.id)}) {- LOG.info("Geofence now obsolete: $oldFence")- removeGeofence(oldFence.id)- } else {- remainingFences.add(oldFence)- LOG.info("Geofence unchanged: $oldFence")+ oldFences.forEach { oldFence ->+ if (geofences.none { Objects.equals(it.id, oldFence.id) }) {+ LOG.info("Geofence now obsolete: $oldFence")+ removeGeofence(oldFence.id)+ } else {+ remainingFences.add(oldFence)+ LOG.info("Geofence unchanged: $oldFence")+ }}- }- geofences.forEach { geofence ->- if (remainingFences.none { Objects.equals(it.id, geofence.id)}) {- addGeofence(geofencingClient, getGeofencePendingIntent(context, getBaseUrl(context).orEmpty()), geofence)+ geofences.forEach { geofence ->+ if (remainingFences.none { Objects.equals(it.id, geofence.id) }) {+ addGeofence(geofencingClient, getGeofencePendingIntent(context, getBaseUrl(context).orEmpty()), geofence)+ }}- }- sharedPreferences.edit()- .putString(geofencesKey, geofencesJson)- .apply()+ sharedPreferences.edit()+ .putString(geofencesKey, geofencesJson)+ .apply()+ } catch (e: Exception) {+ LOG.log(Level.SEVERE, "Failed to refresh geofences", e)+ }}private fun onEnable(callback: EnableCallback?) {diff --git a/console/android/src/main/java/org/openremote/android/service/TokenService.java b/console/android/src/main/java/org/openremote/android/service/TokenService.javaindex a8526b616..d8a08a846 100644--- a/console/android/src/main/java/org/openremote/android/service/TokenService.java+++ b/console/android/src/main/java/org/openremote/android/service/TokenService.java@@ -65,46 +65,6 @@ public class TokenService {realm = context.getString(R.string.OR_REALM);}- public void saveToken(String refreshToken) {- LOG.fine("Saving offline refresh token");- SharedPreferences.Editor editor = sharedPref.edit();- editor.putString(refreshTokenKey, refreshToken);- editor.commit();- }-- public String getJsonToken() {- String refreshToken = sharedPref.getString(refreshTokenKey, null);- return refreshToken == null ? null : "{ \"refreshToken\": \"" + refreshToken + "\"}";- }-- public void withAccessToken(final TokenCallback callback) {- Call<Map<String, String>> call = oauth2Service.refreshToken(realm, "refresh_token", "openremote", sharedPref.getString(refreshTokenKey, null));- call.enqueue(new Callback<Map<String, String>>() {- @Override- public void onResponse(Call<Map<String, String>> call, Response<Map<String, String>> response) {- if (response.isSuccessful()) {- if (response.body() != null) {- try {- LOG.fine("Access token successfully updated");- callback.onToken("Bearer " + response.body().get("access_token"));- } catch (IOException e) {- callback.onFailure(e);- }- } else {- callback.onFailure(new NullPointerException("No response body on update access token request"));- }- } else {- callback.onFailure(new IllegalStateException("Unsuccessful response in update access token request: " + response.code()));- }- }-- @Override- public void onFailure(Call call, Throwable t) {- callback.onFailure(t);- }- });- }-public void sendOrStoreFCMToken(String fcmToken, String deviceId) {LOG.info("Storing FCM token: " + fcmToken);LOG.info("Storing Device ID: " + deviceId);@@ -114,13 +74,6 @@ public class TokenService {editor.commit();}- public void clearToken() {- LOG.info("Clearing auth refresh token");- SharedPreferences.Editor editor = sharedPref.edit();- editor.remove(refreshTokenKey);- editor.commit();- }-// TODO: Support other content typespublic void executeRequest(final String httpMethod, String url, String body) {@@ -189,37 +142,6 @@ public class TokenService {}}-// public void executeAction(final AlertAction alertAction) {-// withAccessToken(new TokenCallback() {-// @Override-// public void onToken(String accessToken) throws IOException {-// restApiResource.updateAssetAction(realm, accessToken, alertAction.getAssetId(), alertAction.getAttributeName(), alertAction.getRawJson()).enqueue(new Callback<Void>() {-// @Override-// public void onResponse(Call<Void> call, Response<Void> response) {-// if (response.code() != 204) {-// LOG.severe("Error executing asset write: " + alertAction + ", response code: " + response.code());-// } else {-// LOG.fine("Asset write executed successfully: " + alertAction);-// }-// }-//-// @Override-// public void onFailure(Call<Void> call, Throwable t) {-// LOG.log(Level.SEVERE, "Error executing asset write: " + alertAction, t);-// }-// });-//-// }-//-// @Override-// public void onFailure(Throwable t) {-// // TODO We should tell the user to login again or it will never work-// LOG.log(Level.SEVERE, "Error executing asset write (no access token): " + alertAction, t);-// }-// });-//-// }-public void notificationDelivered(final Long notificationId, final String fcmToken) {LOG.info("Notification status update 'delivered': " + notificationId);@@ -298,4 +220,32 @@ public class TokenService {throw new RuntimeException(e);}}++ protected void withAccessToken(final TokenCallback callback) {+ Call<Map<String, String>> call = oauth2Service.refreshToken(realm, "refresh_token", "openremote", sharedPref.getString(refreshTokenKey, null));+ call.enqueue(new Callback<Map<String, String>>() {+ @Override+ public void onResponse(Call<Map<String, String>> call, Response<Map<String, String>> response) {+ if (response.isSuccessful()) {+ if (response.body() != null) {+ try {+ LOG.fine("Access token successfully updated");+ callback.onToken("Bearer " + response.body().get("access_token"));+ } catch (IOException e) {+ callback.onFailure(e);+ }+ } else {+ callback.onFailure(new NullPointerException("No response body on update access token request"));+ }+ } else {+ callback.onFailure(new IllegalStateException("Unsuccessful response in update access token request: " + response.code()));+ }+ }++ @Override+ public void onFailure(Call call, Throwable t) {+ callback.onFailure(t);+ }+ });+ }}diff --git a/console/android/src/main/res/values/strings.xml b/console/android/src/main/res/values/strings.xmlindex 8d722076c..6411ab9ed 100644--- a/console/android/src/main/res/values/strings.xml+++ b/console/android/src/main/res/values/strings.xml@@ -1,7 +1,7 @@<resources><string name="OR_CONSOLE_NAME">OpenRemote</string>- <string name="OR_CONSOLE_PROVIDERS">geofence push</string>- <string name="WEBSITE_URL">http://www.openremote.com/</string>+ <string name="OR_CONSOLE_PROVIDERS">geofence push storage</string>+ <string name="WEBSITE_URL">http://www.openremote.io/</string><string name="OR_BASE_SERVER">http://192.168.0.143:8080</string><string name="OR_CONSOLE_URL">/console/REALM/index.html</string><string name="OR_CONSOLE_LOAD_ERROR_URL"></string>