From 2ddfbed6db8a1d209bcba3b7822b4bca0bd84ee8 Mon Sep 17 00:00:00 2001
From: Nirothipan <nirothipan@gmail.com>
Date: Thu, 21 Sep 2017 14:05:30 +0530
Subject: [PATCH] changing variable names

---
 .../mdm/services/android/util/AndroidConstants.java       | 4 ++--
 .../public/js/operation-bar.js                            | 8 +++-----
 .../private/config.json                                   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
index b92afb97e1..3a93305bd7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
@@ -74,8 +74,8 @@ public final class AndroidConstants {
         }
 
         public static final String DEVICE_LOCK = "DEVICE_LOCK";
-        public static final String FILE_DOWNLOAD = "FILE_UPLOAD";
-        public static final String FILE_UPLOAD = "FILE_DOWNLOAD";
+        public static final String FILE_DOWNLOAD = "FILE_UPLOAD_TO_THE_DEVICE";
+        public static final String FILE_UPLOAD = "FILE_DOWNLOAD_FROM_THE_DEVICE";
         public static final String DEVICE_UNLOCK = "DEVICE_UNLOCK";
         public static final String DEVICE_LOCATION = "DEVICE_LOCATION";
         public static final String WIFI = "WIFI";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
index 59302a67ff..aebf833f05 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
@@ -37,7 +37,7 @@ function changeLabel(type) {
     if (type == "no") {
         $(".modal #operation-warn-msg span").text("File will be saved in default location if not specified.");
         $(".modal #operation-warn-msg").removeClass("hidden");
-        document.getElementById('fileURL').placeholder = "FTP URL of the file";
+        document.getElementById('fileURL').placeholder = "HTTP/FTP URL of the file";
         document.getElementById('fileLocation').placeholder = "Location to save file in device";
     } else {
         $(".modal #operation-warn-msg").addClass("hidden");
@@ -197,13 +197,11 @@ function validatePayload(operationCode, payload) {
             break;
         case "FILE_TRANSFER":
             if (payload.upload && !payload.fileURL) {
-                returnVal = "Please enter the FTP URL of the file";
+                returnVal = "Please enter the URL of the file";
             } else if (!payload.upload && !payload.fileURL) {
                 returnVal = "Please enter the FTP URL of the folder to upload file";
             }
-            else if (!payload.ftpPassword) {
-                returnVal = "Please enter FTP password";
-            } else if (!payload.upload && !payload.fileLocation) {
+            else if (!payload.upload && !payload.fileLocation) {
                 returnVal = "Please specify the file location in device";
             }
             break;
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
index 63fcf74c2f..05b8e1432e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
@@ -157,7 +157,7 @@
                         "type": "password",
                         "id": "ftpPassword",
                         "optional": false,
-                        "label": "FTP Password"
+                        "label": "Password (Ignore if you don't need any)"
                     },
                     {
                         "type": "text",