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 logging related updates
Rich Turner16e6bfbd9e4b
diff --git a/console/android/src/main/java/org/openremote/android/MainActivity.java b/console/android/src/main/java/org/openremote/android/MainActivity.javaindex 79cc71884..997132847 100644--- a/console/android/src/main/java/org/openremote/android/MainActivity.java+++ b/console/android/src/main/java/org/openremote/android/MainActivity.java@@ -135,7 +135,7 @@ public class MainActivity extends Activity {protected void onCreate(Bundle savedInstanceState) {super.onCreate(savedInstanceState);- if (Boolean.parseBoolean(getApplicationContext().getString(R.string.DEBUG_LOGGING))) {+ if (BuildConfig.DEBUG) {// Check write permission for logging purposesString writePermission = Manifest.permission.WRITE_EXTERNAL_STORAGE;diff --git a/console/android/src/main/java/org/openremote/android/MainApplication.java b/console/android/src/main/java/org/openremote/android/MainApplication.javaindex 47028fa21..a97da7894 100644--- a/console/android/src/main/java/org/openremote/android/MainApplication.java+++ b/console/android/src/main/java/org/openremote/android/MainApplication.java@@ -18,17 +18,16 @@ public class MainApplication extends Application {super.onCreate();// Fix and configure JUL- if (BuildConfig.DEBUG) {- AndroidLoggingHandler.reset(new AndroidLoggingHandler());+ AndroidLoggingHandler.reset(new AndroidLoggingHandler());- if (Boolean.parseBoolean(getApplicationContext().getString(R.string.DEBUG_LOGGING))) {- java.util.logging.Logger.getLogger("org.openremote").setLevel(Level.FINEST);+ if (BuildConfig.DEBUG) {+ java.util.logging.Logger.getLogger("org.openremote").setLevel(Level.FINEST);+ java.util.logging.Logger.getLogger("io.openremote").setLevel(Level.FINEST);- // Get write permission- String writePermission = Manifest.permission.WRITE_EXTERNAL_STORAGE;- if (ContextCompat.checkSelfPermission(getApplicationContext(), writePermission) == PackageManager.PERMISSION_GRANTED) {- addFileHandler(getApplicationContext());- }+ // Get write permission+ String writePermission = Manifest.permission.WRITE_EXTERNAL_STORAGE;+ if (ContextCompat.checkSelfPermission(getApplicationContext(), writePermission) == PackageManager.PERMISSION_GRANTED) {+ addFileHandler(getApplicationContext());}}diff --git a/console/android/src/main/res/values/strings.xml b/console/android/src/main/res/values/strings.xmlindex 90371e6c1..8d722076c 100644--- a/console/android/src/main/res/values/strings.xml+++ b/console/android/src/main/res/values/strings.xml@@ -17,7 +17,6 @@<string name="SHARED_PREF_OPENED_ALERT">OPENED_ALERT</string><string name="AUTH_URL">/auth</string><string name="SSL_IGNORE">false</string>- <string name="DEBUG_LOGGING">false</string><string name="exit">exit</string><string name="fatalError">Sorry, there is a problem.</string><string name="fatalErrorExplain">The service is not available, please try again later.</string>