Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Some code cleanup and updated libs

Michael Rademaker7592edb43072
diff --git a/console/android/build.gradle b/console/android/build.gradle
index 92c3fc244..7b580dce1 100644
--- a/console/android/build.gradle
+++ b/console/android/build.gradle
@@ -1,59 +1,10 @@
-buildscript {
- ext.kotlin_version = '1.2.51'
- repositories {
- google()
- jcenter()
- mavenCentral()
- maven {
- url "https://maven.google.com"
- }
- maven {
- url 'https://dl.bintray.com/kotlin/kotlin-dev/'
- }
- maven {
- url "https://oss.sonatype.org/content/repositories/snapshots/"
- }
- maven {
- url "http://m2repo.openremote.com/content/groups/public/"
- }
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
- classpath "com.google.gms:google-services:4.0.1"
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- }
-}
-
-allprojects {
- repositories {
- google()
- jcenter()
- }
-}
-
apply plugin: "com.android.library"
apply plugin: 'kotlin-android'
version = projectVersion
-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.google.firebase:firebase-messaging:$fcmVersion"
- implementation "com.squareup.retrofit2:converter-jackson:$jacksonVersion"
- implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
- implementation "com.google.android.gms:play-services-location:$googlePlayVersion"
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-
android {
-
-
-
compileSdkVersion Integer.valueOf(androidCompileVersion)
buildToolsVersion androidBuildToolsVersion
@@ -87,5 +38,18 @@ android {
buildTypes {
}
- buildToolsVersion '27.0.3'
+ buildToolsVersion '28.0.3'
+}
+
+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.google.firebase:firebase-messaging:$fcmVersion"
+ implementation "com.squareup.retrofit2:converter-jackson:$jacksonVersion"
+ implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
+ implementation "com.google.android.gms:play-services-location:$googlePlayVersion"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
diff --git a/console/android/src/main/AndroidManifest.xml b/console/android/src/main/AndroidManifest.xml
index b19738ee1..656bfab73 100644
--- a/console/android/src/main/AndroidManifest.xml
+++ b/console/android/src/main/AndroidManifest.xml
@@ -30,16 +30,6 @@
<meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
- <activity
- android:name=".MainActivity"
- android:configChanges="orientation|screenSize"
- android:label="@string/OR_CONSOLE_NAME"
- android:windowSoftInputMode="adjustResize">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity>
<service
android:name="org.openremote.android.ORFirebaseMessagingService">
diff --git a/console/android/src/main/java/org/openremote/android/MainActivity.java b/console/android/src/main/java/org/openremote/android/MainActivity.java
index 997132847..850cde908 100644
--- a/console/android/src/main/java/org/openremote/android/MainActivity.java
+++ b/console/android/src/main/java/org/openremote/android/MainActivity.java
@@ -119,10 +119,10 @@ public class MainActivity extends Activity {
}
return getString(R.string.OR_BASE_SERVER) + getString(R.string.OR_CONSOLE_URL)
- + "?consolePlatform=" + platform
- + "&consoleName=" + name
- + "&consoleVersion=" + version
- + "&consoleProviders=" + providers;
+ + "?consolePlatform=" + platform
+ + "&consoleName=" + name
+ + "&consoleVersion=" + version
+ + "&consoleProviders=" + providers;
}
@Override
@@ -150,7 +150,7 @@ public class MainActivity extends Activity {
try {
String timeoutStr = getString(R.string.OR_CONSOLE_LOAD_TIMEOUT);
webViewTimeout = Integer.parseInt(timeoutStr);
- } catch(NumberFormatException nfe) {
+ } catch (NumberFormatException nfe) {
System.out.println("Could not parse console load timeout value: " + nfe);
}
@@ -283,7 +283,6 @@ public class MainActivity extends Activity {
webView.setWebViewClient(new WebViewClient() {
-
@Override
public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
@@ -291,9 +290,9 @@ public class MainActivity extends Activity {
// server was reinstalled), we detect the failure and then don't show an error view. We clear the stored
// invalid token. The web app will then start a new login.
if (request.getUrl().getLastPathSegment() != null &&
- request.getUrl().getLastPathSegment().equals("token") &&
- request.getMethod().equals("POST") &&
- errorResponse.getStatusCode() == 400) {
+ request.getUrl().getLastPathSegment().equals("token") &&
+ request.getMethod().equals("POST") &&
+ errorResponse.getStatusCode() == 400) {
webAppInterface.tokenService.clearToken();
return;
}
@@ -333,8 +332,8 @@ public class MainActivity extends Activity {
}
handleError(
- error.getErrorCode(), error.getDescription().toString(),
- request.getUrl().toString(), request.isForMainFrame());
+ error.getErrorCode(), error.getDescription().toString(),
+ request.getUrl().toString(), request.isForMainFrame());
}
@Override
@@ -342,7 +341,7 @@ public class MainActivity extends Activity {
Runnable run = new Runnable() {
public void run() {
- if(!webViewLoaded) {
+ if (!webViewLoaded) {
handleError(ERROR_TIMEOUT, "Connection timed out", url, true);
}
}
@@ -378,8 +377,8 @@ public class MainActivity extends Activity {
//TODO should we always ignore image errors?
if (failingUrl != null && (failingUrl.endsWith("png")
- || failingUrl.endsWith("jpg")
- || failingUrl.endsWith("ico"))) {
+ || failingUrl.endsWith("jpg")
+ || failingUrl.endsWith("ico"))) {
LOG.info("Ignoring error loading image resource");
return;
}
@@ -418,7 +417,7 @@ public class MainActivity extends Activity {
ActivityCompat.requestPermissions((MainActivity) context, new String[]{writePermission}, WRITE_PERMISSION_FOR_DOWNLOAD);
} else {
DownloadManager.Request request = new
- DownloadManager.Request(Uri.parse(url));
+ DownloadManager.Request(Uri.parse(url));
request.setMimeType(mimetype);
//------------------------COOKIE!!------------------------
@@ -463,28 +462,28 @@ public class MainActivity extends Activity {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
geofenceProvider.enable(MainActivity.this,
- String.format("%s/%s",
- getString(R.string.OR_BASE_SERVER),
- getString(R.string.OR_REALM)),
- consoleId,
- new GeofenceProvider.EnableCallback() {
- @Override
- public void accept(@NotNull Map<String, ?> responseData) {
- try {
- final String jsonString = new ObjectMapper().writeValueAsString(responseData);
- MainActivity.this.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- webView.evaluateJavascript(String.format(
- "openremote.INSTANCE.console.handleProviderResponse('%s')",
- jsonString), null);
- }
- });
- } catch (Exception e) {
- e.printStackTrace();
- }
+ String.format("%s/%s",
+ getString(R.string.OR_BASE_SERVER),
+ getString(R.string.OR_REALM)),
+ consoleId,
+ new GeofenceProvider.EnableCallback() {
+ @Override
+ public void accept(@NotNull Map<String, ?> responseData) {
+ try {
+ final String jsonString = new ObjectMapper().writeValueAsString(responseData);
+ MainActivity.this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ webView.evaluateJavascript(String.format(
+ "openremote.INSTANCE.console.handleProviderResponse('%s')",
+ jsonString), null);
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
}
- });
+ }
+ });
}
} else {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -561,15 +560,15 @@ public class MainActivity extends Activity {
if (consoleId != null) {
((MainActivity) activity).consoleId = consoleId;
geofenceProvider.enable(MainActivity.this, String.format("%s/%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);
- }
- });
+ 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")) {
@@ -662,7 +661,7 @@ public class MainActivity extends Activity {
@Override
public void onReceive(Context context, Intent intent) {
ConnectivityManager cm
- = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+ = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
onConnectivityChanged(activeNetwork != null && activeNetwork.isConnectedOrConnecting());
diff --git a/console/android/src/main/java/org/openremote/android/service/OAuth2Service.java b/console/android/src/main/java/org/openremote/android/service/OAuth2Service.java
index 19dae46b8..624944e97 100644
--- a/console/android/src/main/java/org/openremote/android/service/OAuth2Service.java
+++ b/console/android/src/main/java/org/openremote/android/service/OAuth2Service.java
@@ -1,16 +1,16 @@
package org.openremote.android.service;
-import java.util.Map;
-
import retrofit2.Call;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
import retrofit2.http.POST;
import retrofit2.http.Path;
+import java.util.Map;
+
public interface OAuth2Service {
@FormUrlEncoded
@POST("/auth/realms/{realm}/protocol/openid-connect/token")
- Call<Map<String,String>> refreshToken(@Path("realm") String realm, @Field("grant_type") String grantType, @Field("client_id") String clientId, @Field("refresh_token") String refreshToken);
+ Call<Map<String, String>> refreshToken(@Path("realm") String realm, @Field("grant_type") String grantType, @Field("client_id") String clientId, @Field("refresh_token") String refreshToken);
}
diff --git a/console/android/src/main/java/org/openremote/android/service/RestApiResource.java b/console/android/src/main/java/org/openremote/android/service/RestApiResource.java
index a25c7386d..7c8b92e15 100644
--- a/console/android/src/main/java/org/openremote/android/service/RestApiResource.java
+++ b/console/android/src/main/java/org/openremote/android/service/RestApiResource.java
@@ -1,9 +1,6 @@
package org.openremote.android.service;
-import java.util.List;
-
-import org.json.JSONObject;
import retrofit2.Call;
import retrofit2.http.*;
diff --git a/console/android/src/main/java/org/openremote/android/service/TokenCallback.java b/console/android/src/main/java/org/openremote/android/service/TokenCallback.java
index 3e853871f..caeb3cd2f 100644
--- a/console/android/src/main/java/org/openremote/android/service/TokenCallback.java
+++ b/console/android/src/main/java/org/openremote/android/service/TokenCallback.java
@@ -2,7 +2,7 @@ package org.openremote.android.service;
import java.io.IOException;
-interface TokenCallback {
+public interface TokenCallback {
void onToken(String accessToken) throws IOException;
void onFailure(Throwable t);
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.java
index f8fc8a1a6..a8526b616 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
@@ -3,34 +3,27 @@ package org.openremote.android.service;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
-
import android.text.TextUtils;
-import okhttp3.*;
-import okhttp3.internal.http.HttpMethod;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
import org.openremote.android.R;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+import retrofit2.converter.scalars.ScalarsConverterFactory;
+import javax.net.ssl.*;
import java.io.IOException;
import java.security.cert.CertificateException;
-import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-import retrofit2.converter.jackson.JacksonConverterFactory;
-import retrofit2.converter.scalars.ScalarsConverterFactory;
-
public class TokenService {
@@ -50,9 +43,9 @@ public class TokenService {
baseUrl = context.getString(R.string.OR_BASE_SERVER);
Retrofit.Builder builder = new Retrofit.Builder()
- .baseUrl(baseUrl)
- .addConverterFactory(ScalarsConverterFactory.create())
- .addConverterFactory(JacksonConverterFactory.create());
+ .baseUrl(baseUrl)
+ .addConverterFactory(ScalarsConverterFactory.create())
+ .addConverterFactory(JacksonConverterFactory.create());
if (Boolean.parseBoolean(context.getString(R.string.SSL_IGNORE))) {
okHttpClient = getUnsafeOkHttpClient();
@@ -145,8 +138,8 @@ public class TokenService {
boolean useAuth = url.startsWith(baseUrl) && !TextUtils.isEmpty(refreshToken);
final Request.Builder requestBuilder = new Request.Builder().url(url);
RequestBody requestBody = !TextUtils.isEmpty(body)
- ? RequestBody.create(MediaType.parse("application/json; charset=utf-8"), body)
- : null;
+ ? RequestBody.create(MediaType.parse("application/json; charset=utf-8"), body)
+ : null;
try {
switch (httpMethod.toUpperCase(Locale.ROOT)) {
@@ -268,20 +261,20 @@ public class TokenService {
try {
// Create a trust manager that does not validate certificate chains
final TrustManager[] trustAllCerts = new TrustManager[]{
- new X509TrustManager() {
- @Override
- public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
- }
+ new X509TrustManager() {
+ @Override
+ public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+ }
- @Override
- public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
- }
+ @Override
+ public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+ }
- @Override
- public java.security.cert.X509Certificate[] getAcceptedIssuers() {
- return new java.security.cert.X509Certificate[]{};
- }
+ @Override
+ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+ return new java.security.cert.X509Certificate[]{};
}
+ }
};
// Install the all-trusting trust manager
diff --git a/console/android/src/main/res/layout/activity_web.xml b/console/android/src/main/res/layout/activity_web.xml
index 5d5d8bcd2..5b2afff63 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"></include>
</RelativeLayout>