fix(enroll): validate if base64 decode fail

flyve-mdm · Nov 2, 2017 · 59d09b3 · 59d09b3
1 parent 3a722dd
commit 59d09b3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/main/java/org/flyve/mdm/agent/ui/StartEnrollmentActivity.java b/app/src/main/java/org/flyve/mdm/agent/ui/StartEnrollmentActivity.java
@@ -87,7 +87,16 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent intent = getIntent();
         Uri data = intent.getData();
 
-        String deepLinkData = Helpers.base64decode(data.getQueryParameter("data"));
+        String deepLinkErrorMessage = getResources().getString(R.string.ERROR_DEEP_LINK);
+        String deepLinkData;
+
+        try {
+            deepLinkData = Helpers.base64decode(data.getQueryParameter("data"));
+        } catch(Exception ex) {
+            showError( deepLinkErrorMessage );
+            FlyveLog.e(deepLinkErrorMessage + " - " + ex.getMessage());
+            return;
+        }
 
         String url;
         String userToken;
@@ -96,7 +105,6 @@ protected void onCreate(Bundle savedInstanceState) {
         String phone;
         String website;
         String email;
-        String deepLinkErrorMessage = getResources().getString(R.string.ERROR_DEEP_LINK);
 
         try {
             // CSV comma-separated values format