WIP Unit test to MQTT model

app/src/androidTest/java/org/flyve/mdm/agent/core/mqtt/MqttModelTest.java

@@ -0,0 +1,63 @@
+package org.flyve.mdm.agent.core.mqtt;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+
+import org.flyve.mdm.agent.ui.StartEnrollmentActivity;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+
+/*
+ *   Copyright  2018 Teclib. All rights reserved.
+ *
+ *   This file is part of flyve-mdm-android
+ *
+ * flyve-mdm-android is a subproject of Flyve MDM. Flyve MDM is a mobile
+ * device management software.
+ *
+ * Flyve MDM is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Flyve MDM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ------------------------------------------------------------------------------
+ * @author    @rafaelje
+ * @date      25/6/18
+ * @copyright Copyright  2018 Teclib. All rights reserved.
+ * @license   GPLv3 https://www.gnu.org/licenses/gpl-3.0.html
+ * @link      https://github.com/flyve-mdm/flyve-mdm-android
+ * @link      https://flyve-mdm.com
+ * ------------------------------------------------------------------------------
+ */
+
+public class MqttModelTest {
+
+    private Context context;
+    private MqttModel model;
+
+    @Rule
+    public ActivityTestRule<StartEnrollmentActivity> rule  = new ActivityTestRule<>(StartEnrollmentActivity.class);
+
+    @Before
+    public void setUp() {
+        context = InstrumentationRegistry.getTargetContext();
+        mqtt.Presenter presenter = mock(mqtt.Presenter.class);
+        model = new MqttModel(presenter);
+    }
+
+
+    @Test
+    public void lint() {
+
+        Assert.assertTrue(true);
+    }
+}

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.flyve.mdm.agent"
-    android:versionCode="2618"
+    android:versionCode="2916"
     android:versionName="2.0.0-rc.5">
 
     <!-- For writing logfiles -->

app/src/main/assets/about.properties

@@ -1,6 +1,6 @@
-about.version=2.0.0-rc.4
-about.build=2556
-about.date=Wed Sep 26 19:33:47 2018
+about.version=2.0.0-rc.5
+about.build=2869
+about.date=Tue Nov 20 19:07:10 2018
 about.commit=
 about.commitFull=
 about.github=https://github.com/flyve-mdm/flyve-mdm-android-agent

app/src/main/java/org/flyve/mdm/agent/adapter/ApplicationsAdapter.java

@@ -96,7 +96,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			app = data[position];
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView",ex.getMessage());
 			return vi;
 		}
 
@@ -114,7 +114,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 					status = parent.getResources().getString(R.string.app_installed);
 				}
 			} catch (Exception ex) {
-				FlyveLog.e(ex.getMessage());
+				FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			}
 		} else {
 			status = parent.getResources().getString(R.string.app_not_installed);

app/src/main/java/org/flyve/mdm/agent/adapter/ConnectivityAdapter.java

@@ -93,7 +93,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			hashdata = data.get(position);
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			return vi;
 		}
 

app/src/main/java/org/flyve/mdm/agent/adapter/DrawerAdapter.java

@@ -93,7 +93,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			hashdata = data.get(position);
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			return vi;
 		}
 

app/src/main/java/org/flyve/mdm/agent/adapter/FilesAdapter.java

@@ -92,7 +92,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			file = data[position];
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			return vi;
 		}
 

app/src/main/java/org/flyve/mdm/agent/adapter/LogAdapter.java

@@ -45,7 +45,7 @@ public LogAdapter(Activity activity, List<HashMap<String, String>> data) {
 		try {
 			inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", LogAdapter", ex.getMessage());
 		}
 	}
 
@@ -94,7 +94,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			hashdata = data.get(position);
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			return vi;
 		}
 

app/src/main/java/org/flyve/mdm/agent/adapter/PoliciesAdapter.java

@@ -92,7 +92,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		try {
 			hashdata = data.get(position);
 		} catch (Exception ex) {
-			FlyveLog.e(ex.getMessage());
+			FlyveLog.e(this.getClass().getName() + ", getView", ex.getMessage());
 			return vi;
 		}
 

app/src/main/java/org/flyve/mdm/agent/core/Routes.java

@@ -92,16 +92,16 @@ public String pluginFlyvemdmAgent(String agentId) {
      * @param fileId String file id
      * @return String url
      */
-    public String pluginFlyvemdmFile(String fileId, String sessionToken) {
-        return url + "/PluginFlyvemdmFile/" + fileId + "?session_token=" + sessionToken;
+    public String pluginFlyvemdmFile(String fileId) {
+        return url + "/PluginFlyvemdmFile/" + fileId;
     }
 
     /**
      * Download apk
      * @param fileId String file id
      * @return String url
      */
-    public String pluginFlyvemdmPackage(String fileId, String sessionToken) {
-        return url + "/PluginFlyvemdmPackage/" + fileId + "?session_token=" + sessionToken;
+    public String pluginFlyvemdmPackage(String fileId) {
+        return url + "/PluginFlyvemdmPackage/" + fileId;
     }
 }

app/src/main/java/org/flyve/mdm/agent/core/deeplink/DeeplinkModel.java

@@ -53,7 +53,7 @@ public void lint(Context context, String deeplink) {
             deepLinkData = Helpers.base64decode(deeplink);
         } catch(Exception ex) {
             presenter.showSnackError( CommonErrorType.DEEPLINK_BASE64DECODE, deepLinkErrorMessage);
-            FlyveLog.e(deepLinkErrorMessage + " - " + ex.getMessage());
+            FlyveLog.e(this.getClass().getName() + ", lint", deepLinkErrorMessage + " - " + ex.getMessage());
             return;
         }
 
@@ -127,7 +127,7 @@ public void lint(Context context, String deeplink) {
             presenter.lintSuccess(deeplinkSchema);
 
         } catch (Exception ex) {
-            FlyveLog.e(ex.getMessage());
+            FlyveLog.e(this.getClass().getName() + ", lint", ex.getMessage());
             presenter.showSnackError( CommonErrorType.DEEPLINK_GENERAL_EXCEPTION, deepLinkErrorMessage );
         }
     }
@@ -152,11 +152,9 @@ public void saveSupervisor(Context context, String name, String phone, String we
     @Override
     public void saveMQTTConfig(Context context, String url, String userToken, String invitationToken) {
         MqttData cache = new MqttData(context);
-        if(cache.getUrl().isEmpty()) {
-            cache.setUrl(url);
-            cache.setUserToken(userToken);
-            cache.setInvitationToken(invitationToken);
-        }
+        cache.setUrl(url);
+        cache.setUserToken(userToken);
+        cache.setInvitationToken(invitationToken);
     }
 
     @Override

app/src/main/java/org/flyve/mdm/agent/core/enrollment/EnrollmentHelper.java

@@ -88,7 +88,7 @@ private String manageError(String error) {
         String errorMessage = "";
 
         if(error.contains("EXCEPTION_HTTP") || error.contains("ERROR")) {
-            FlyveLog.e(error);
+            FlyveLog.e(this.getClass().getName() + ", manageError", error);
 
             errorMessage = error;
 
@@ -107,7 +107,7 @@ private String manageError(String error) {
                     errorMessage = errorArray[0];
                 }
             } catch (Exception ex) {
-                FlyveLog.e(ex.getMessage());
+                FlyveLog.e(this.getClass().getName() + ", manageError", ex.getMessage());
             }
 
             return errorMessage;
@@ -128,10 +128,11 @@ public void run()
                 String profileId = "";
                 JSONObject jsonSession;
                 HashMap<String, String> header = new HashMap();
+                header.put("user_token", cache.getUserToken());
 
                 try {
                     // STEP 1 get session token
-                    data = getSyncWebData(routes.initSession(cache.getUserToken()), "GET", null);
+                    data = getSyncWebData(routes.initSession(cache.getUserToken()), "GET", header);
 
                     final String errorMessage = manageError(data);
                     if(!errorMessage.equals("")) {
@@ -148,7 +149,7 @@ public void run() {
                     cache.setSessionToken(sessionToken);
 
                 } catch (final Exception ex) {
-                    FlyveLog.e(ex.getMessage());
+                    FlyveLog.e(this.getClass().getName() + ", getActiveSessionToken", ex.getMessage());
                     EnrollmentHelper.runOnUI(new Runnable() {
                         public void run() {
                             callback.onError(CommonErrorType.ENROLLMENT_HELPER_INITSESSION, context.getString(R.string.wrong_json_format, data, ex.getMessage()));
@@ -182,7 +183,7 @@ public void run() {
                     cache.setProfileId(profileId);
 
                 } catch (final Exception ex) {
-                    FlyveLog.e(ex.getMessage());
+                    FlyveLog.e(this.getClass().getName() + ", getActiveSessionToken", ex.getMessage());
                     EnrollmentHelper.runOnUI(new Runnable() {
                         public void run() {
                             callback.onError(CommonErrorType.ENROLLMENT_HELPER_FULLSESSION, context.getString(R.string.wrong_json_format, data, ex.getMessage()));
@@ -209,7 +210,7 @@ public void run() {
                         });
                     }
                 } catch (final Exception ex) {
-                    FlyveLog.e(ex.getMessage());
+                    FlyveLog.e(this.getClass().getName() + ", getActiveSessionToken", ex.getMessage());
                     EnrollmentHelper.runOnUI(new Runnable() {
                         public void run() {
                             callback.onError(CommonErrorType.ENROLLMENT_HELPER_CHANGEACTIVEPROFILE, context.getString(R.string.wrong_json_format, data, ex.getMessage()));
@@ -257,7 +258,7 @@ public void run() {
 
                 if(data.contains("ERROR")){
                     final String msgError = manageError(data);
-                    FlyveLog.e(msgError + " - Device serial: " + Helpers.getDeviceSerial());
+                    FlyveLog.e(this.getClass().getName() + ", enrollment", msgError + " - Device serial: " + Helpers.getDeviceSerial());
 
                     EnrollmentHelper.runOnUI(new Runnable() {
                         public void run() {
@@ -357,7 +358,7 @@ public void run() {
                         }
                     });
                 } catch (Exception ex) {
-                    FlyveLog.e(ex.getMessage());
+                    FlyveLog.e(this.getClass().getName() + ", createX509cert", ex.getMessage());
                     EnrollmentHelper.runOnUI(new Runnable() {
                         public void run() {
                             callback.onError(CommonErrorType.ENROLLMENT_HELPER_X509CERTIFICATION, "false");

app/src/main/java/org/flyve/mdm/agent/core/enrollment/EnrollmentModel.java

@@ -192,7 +192,6 @@ public void onSuccess(String data) {
                     // -------------------------------
                     MqttData cache = new MqttData(activity);
                     cache.setInvitationToken("");
-                    cache.setUserToken("");
 
                     presenter.enrollSuccess();
                 }