feat(enroll): add snackbar error on enroll (#113)

* fix(splash): add single task

* fix(history): close history back

* feat(mqtt): send start enrollment

* feat(mqtt): if unenroll open splash screen

* fix(mqtt): check if password is null before unrollment

* fix(navigation): close splash screen on enrollment with deep link

* fix(design): remove ic_warning file from drawable

* feat(enroll): add snackbar to Helpers

* feat(enroll): add snackbar error on enrollment start

* feat(enroll): add snackbar error on enroll form

* fix(agent): remove unused code

* feat(mqtt): send inventory on connect to mqtt

* fix(enroll): add location text to error snackbar

* feat(mqtt): add mqtt Helper to clean mqtt service

* feat(mqtt): add tag to logger

* fix(mqtt): subscribe to multiples channels

* feat(mqtt): send mqtt connection error to broadcast and show on snackbar

app/build.gradle

@@ -41,14 +41,15 @@ dependencies {
     }
 
     compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.1'
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:design:22.2.0'
+    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'com.android.support:design:22.2.1'
+    compile 'com.android.support:support-v4:22.2.1'
     compile 'com.madgag.spongycastle:core:1.54.0.0'
     compile 'com.madgag.spongycastle:prov:1.54.0.0'
     compile 'com.madgag.spongycastle:pkix:1.54.0.0'
     compile 'com.orhanobut:logger:2.1.0'
     compile 'com.flyvemdm:inventory:1.0.2@aar'
-    compile 'com.android.support:support-v4:22.2.0'
+
 }
 
 import java.util.regex.Pattern

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.flyve.mdm.agent"
-    android:versionCode="122"
-    android:versionName="1.0.124">
+    android:versionCode="144"
+    android:versionName="1.0.146">
 
     <!-- For writing logfiles -->
     <uses-permission android:name="android.permisson.READ_EXTERNAL_STORAGE" />

app/src/main/java/org/flyve/mdm/agent/EnrollmentActivity.java

@@ -133,7 +133,7 @@ public void onSuccess(String data) {
             public void onError(String error) {
                 pbx509.setVisibility(View.GONE);
                 btnRegister.setEnabled(false);
-                txtMessage.setText("Error creating certificate X509");
+                showError("Error creating certificate X509");
             }
         });
     }
@@ -245,17 +245,25 @@ public void onSuccess(String data) {
                 public void onError(String error) {
                     pb.setVisibility(View.GONE);
                     enableFields(true);
-                    txtMessage.setText(error);
+                    showError(error);
                 }
             });
         } catch (Exception ex) {
             pb.setVisibility(View.GONE);
             enableFields(true);
-            txtMessage.setText( ex.getMessage() );
+            showError( ex.getMessage() );
             FlyveLog.e( ex.getMessage() );
         }
     }
 
+    private void showError(String message) {
+        Helpers.snack(this, message, this.getResources().getString(R.string.snackbar_close), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            }
+        });
+    }
+
     /**
      * Open the main activity
      */

app/src/main/java/org/flyve/mdm/agent/FragmentInformation.java

@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
@@ -14,9 +13,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import org.flyve.mdm.agent.data.DataStorage;
 import org.flyve.mdm.agent.utils.FlyveLog;
+import org.flyve.mdm.agent.utils.Helpers;
 import org.json.JSONObject;
 
 public class FragmentInformation extends Fragment {
@@ -82,18 +81,6 @@ public void onClick(View v) {
         return v;
     }
 
-    private void showError() {
-        Snackbar.make(FragmentInformation.this.getView(), "Message", Snackbar.LENGTH_LONG)
-                .setActionTextColor(getResources().getColor(R.color.snackbar_action))
-                .setAction("Retry", new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        FlyveLog.d("Retry", "reconnect");
-                    }
-                })
-                .show();
-    }
-
     /**
      * broadcastServiceStatus instance that receive service status from MQTTService
      */
@@ -140,6 +127,15 @@ public void onReceive(Context context, Intent intent) {
                         openSplash();
                     }
 
+                    if("ERROR".equalsIgnoreCase(type)) {
+
+                        Helpers.snack(FragmentInformation.this.getActivity(), body, "close", new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                            }
+                        });
+                    }
+
                 } catch (Exception ex) {
                     FlyveLog.d("ERROR" + ex.getMessage());
                 }

app/src/main/java/org/flyve/mdm/agent/StartEnrollmentActivity.java

@@ -86,23 +86,23 @@ protected void onCreate(Bundle savedInstanceState) {
                 url = jsonLink.getString("url");
             } else {
                 deepLinkErrorMessage = "URL " + deepLinkErrorMessage;
-                txtMessage.setText(deepLinkErrorMessage);
+                showError( deepLinkErrorMessage );
                 return;
             }
 
             if(jsonLink.has("user_token")) {
                 userToken = jsonLink.getString("user_token");
             } else {
                 deepLinkErrorMessage = "USER " + deepLinkErrorMessage;
-                txtMessage.setText(deepLinkErrorMessage);
+                showError( deepLinkErrorMessage );
                 return;
             }
 
             if(jsonLink.has("invitation_token")) {
                 invitationToken = jsonLink.getString("invitation_token");
             } else {
                 deepLinkErrorMessage = "TOKEN " + deepLinkErrorMessage;
-                txtMessage.setText(deepLinkErrorMessage);
+                showError( deepLinkErrorMessage );
                 return;
             }
 
@@ -112,7 +112,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         } catch (Exception ex) {
             FlyveLog.e( ex.getMessage() );
-            txtMessage.setText(deepLinkErrorMessage);
+            showError( deepLinkErrorMessage );
             return;
         }
 
@@ -141,8 +141,7 @@ public void onSuccess(String data) {
                     public void onError(String error) {
                         btnEnroll.setVisibility(View.VISIBLE);
                         pb.setVisibility(View.GONE);
-                        txtMessage.setText(error);
-                        txtTitle.setText(getResources().getString(R.string.fail_enroll));
+                        showError( error );
                     }
                 });
 
@@ -157,6 +156,15 @@ public void broadcastClose() {
         LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(in);
     }
 
+    private void showError(String message) {
+        txtTitle.setText(getResources().getString(R.string.fail_enroll));
+
+        Helpers.snack(this, message, this.getResources().getString(R.string.snackbar_close), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+            }
+        });
+    }
 
     /**
      * Open activity