From 3dfc1cb14adf0f62fa7f042b3ba725aca2288ed8 Mon Sep 17 00:00:00 2001 From: inoshperera Date: Mon, 21 May 2018 11:02:29 +0530 Subject: [PATCH 1/2] Fixed https://github.com/wso2/product-iots/issues/1822 The root detection needs to happen prior to enrolling a device. This check has been added to the agent. --- client/client/build.gradle | 4 +-- .../iot/agent/activities/SplashActivity.java | 25 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/client/client/build.gradle b/client/client/build.gradle index 5ebc5687..2f21ea86 100644 --- a/client/client/build.gradle +++ b/client/client/build.gradle @@ -36,8 +36,8 @@ android { targetSdkVersion 25 multiDexEnabled true - versionCode 3010032 - versionName "3.1.32" + versionCode 3010033 + versionName "3.1.33" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java b/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java index d204e6d7..2fe8b865 100644 --- a/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java +++ b/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java @@ -19,6 +19,8 @@ package org.wso2.iot.agent.activities; import android.app.Activity; +import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.Handler; @@ -31,6 +33,7 @@ import org.wso2.iot.agent.R; import org.wso2.iot.agent.api.DeviceState; import org.wso2.iot.agent.services.EnrollmentService; +import org.wso2.iot.agent.utils.CommonDialogUtils; import org.wso2.iot.agent.utils.Constants; import org.wso2.iot.agent.utils.Preference; import org.wso2.iot.agent.utils.Response; @@ -72,10 +75,30 @@ protected void onCreate(Bundle savedInstanceState) { decorView.setSystemUiVisibility(uiOptions); /* New Handler to start the WorkProfileSelectionActivity * and close this Splash-Screen after some seconds.*/ + DeviceState state = new DeviceState(this); + final Response deviceCompatibility = state.evaluateCompatibility(); new Handler().postDelayed(new Runnable() { @Override public void run() { - startActivity(); + if (deviceCompatibility.equals(Response.COMPATIBLE)) { + startActivity(); + } else { + AlertDialog.Builder builder = CommonDialogUtils + .getAlertDialogWithOneButton(SplashActivity.this, + SplashActivity.this.getResources() + .getString(deviceCompatibility.getDescriptionResourceID()), + SplashActivity.this.getResources() + .getString(R.string.button_ok), + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface arg0, + int arg1) { + SplashActivity.this.finish(); + } + } + ); + builder.show(); + } } }, AUTO_HIDE_DELAY_MILLIS); } From aac2c2cf4ac0a4bb53ef018c78e43bc4ad92665d Mon Sep 17 00:00:00 2001 From: inoshperera Date: Mon, 21 May 2018 11:06:43 +0530 Subject: [PATCH 2/2] minor formatting fix --- .../java/org/wso2/iot/agent/activities/SplashActivity.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java b/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java index 2fe8b865..1243a520 100644 --- a/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java +++ b/client/client/src/main/java/org/wso2/iot/agent/activities/SplashActivity.java @@ -91,8 +91,7 @@ public void run() { .getString(R.string.button_ok), new DialogInterface.OnClickListener() { @Override - public void onClick(DialogInterface arg0, - int arg1) { + public void onClick(DialogInterface arg0, int arg1) { SplashActivity.this.finish(); } }