diff --git a/product/modules/agents/android/client/bin/R.txt b/product/modules/agents/android/client/bin/R.txt index 3f5cf9fc6b..d45aff00f3 100644 --- a/product/modules/agents/android/client/bin/R.txt +++ b/product/modules/agents/android/client/bin/R.txt @@ -527,7 +527,7 @@ int string application_package_prefix 0x7f0b0099 int string button_cancel 0x7f0b0095 int string button_ok 0x7f0b0094 int string client_id 0x7f0b000f -int string client_secreat 0x7f0b0010 +int string client_secret 0x7f0b0010 int string device_admin_disabled 0x7f0b0030 int string device_admin_enable_alert 0x7f0b003f int string device_admin_enabled 0x7f0b002f diff --git a/product/modules/agents/android/client/bin/cdm-agent.apk b/product/modules/agents/android/client/bin/cdm-agent.apk index 7813e3aa98..8390d778b6 100644 Binary files a/product/modules/agents/android/client/bin/cdm-agent.apk and b/product/modules/agents/android/client/bin/cdm-agent.apk differ diff --git a/product/modules/agents/android/client/bin/classes.dex b/product/modules/agents/android/client/bin/classes.dex index 51faaee6de..737da78cd1 100644 Binary files a/product/modules/agents/android/client/bin/classes.dex and b/product/modules/agents/android/client/bin/classes.dex differ diff --git a/product/modules/agents/android/client/bin/resources.ap_ b/product/modules/agents/android/client/bin/resources.ap_ index a4b3d3c533..ab02067c78 100644 Binary files a/product/modules/agents/android/client/bin/resources.ap_ and b/product/modules/agents/android/client/bin/resources.ap_ differ diff --git a/product/modules/agents/android/client/res/values/strings.xml b/product/modules/agents/android/client/res/values/strings.xml index 9f24ae92df..dbe197631b 100644 --- a/product/modules/agents/android/client/res/values/strings.xml +++ b/product/modules/agents/android/client/res/values/strings.xml @@ -2,7 +2,7 @@ NsOFFVXkUsahefJHDC4S2csarPka - EnG1MjQxF5tiFE0DDNvfJ_6ou_8a + EnG1MjQxF5tiFE0DDNvfJ_6ou_8a Please set the %1$s constant and recompile the app. Device is already registered on server. diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java index ec0558d085..6caf5ea764 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/AlreadyRegisteredActivity.java @@ -150,6 +150,7 @@ public class AlreadyRegisteredActivity extends SherlockActivity implements APIRe btnUnregister = (Button) findViewById(R.id.btnUnreg); btnUnregister.setTag(TAG_BTN_UNREGISTER); btnUnregister.setOnClickListener(onClickListenerButtonClicked); + LocalNotification.startPolling(context); } diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java index 817d5bd7fa..e48cecbf8d 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java @@ -228,7 +228,7 @@ public class AuthenticationActivity extends SherlockActivity implements APIAcces // Check network connection availability before calling the API. if (PhoneState.isNetworkAvailable(context)) { initializeIDPLib(getResources().getString(R.string.client_id), - getResources().getString(R.string.client_secreat)); + getResources().getString(R.string.client_secret)); } else { CommonDialogUtils.stopProgressDialog(progressDialog); CommonDialogUtils.showNetworkUnavailableMessage(context); diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java index 07d92fae08..98ea93944e 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/RegistrationActivity.java @@ -101,10 +101,10 @@ public class RegistrationActivity extends Activity implements APIResultCallBack propertiesArray.put(property); property= new JSONObject(); property.put("name", "imei"); - property.put("value", deviceInfo.getIMSINumber()); + property.put("value", deviceInfo.getDeviceId()); propertiesArray.put(property); property= new JSONObject(); - property.put("name", "imei"); + property.put("name", "imsi"); property.put("value", deviceInfo.getIMSINumber()); propertiesArray.put(property); property= new JSONObject(); @@ -115,11 +115,7 @@ public class RegistrationActivity extends Activity implements APIResultCallBack property.put("name", "vendor"); property.put("value", deviceInfo.getOsVersion()); propertiesArray.put(property); - property= new JSONObject(); - property.put("name", "vendor"); - property.put("value", deviceInfo.getDeviceManufacturer()); - propertiesArray.put(property); - property= new JSONObject(); + property= new JSONObject(); property.put("name", "osVersion"); property.put("value", deviceInfo.getOsVersion()); propertiesArray.put(property); diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerApiAccess.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerApiAccess.java index 675f887f61..5835dde037 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerApiAccess.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/proxy/ServerApiAccess.java @@ -112,6 +112,8 @@ public class ServerApiAccess { } catch (UnsupportedEncodingException e) { e.printStackTrace(); } + }else{ + httpPost.setEntity(null); } Log.e("url",""+url); HttpPost httpPostWithHeaders = (HttpPost)buildHeaders(httpPost,headers,httpMethod); @@ -138,7 +140,7 @@ public class ServerApiAccess { // } HttpGet httpGet = new HttpGet(url); HttpGet httpGetWithHeaders = (HttpGet) buildHeaders(httpGet,headers,httpMethod); - Log.d(TAG,httpGetWithHeaders.toString()); + Log.d(TAG,httpGetWithHeaders.toString()+" GET"); try { HttpResponse response = httpclient.execute(httpGetWithHeaders); responseParams.put("response", getResponseBody(response)); diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java index b36452abbc..ab02601dc0 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/AlarmReceiver.java @@ -32,10 +32,10 @@ public class AlarmReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { Log.d(DEBUG_TAG, "Recurring alarm; requesting download service."); String mode=CommonUtilities.getPref(context, context.getResources().getString(R.string.shared_pref_message_mode)); - if(mode.trim().toUpperCase().equals(Constant.LOCAL)){ + //if(mode.trim().toUpperCase().equals(Constant.LOCAL)){ MessageProcessor messageProcessor=new MessageProcessor(context); messageProcessor.getMessages(); - } + //} } } diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java index fe79aa677a..8f86e54a5a 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/LocalNotification.java @@ -26,18 +26,22 @@ import android.os.SystemClock; * polls to server based on a predefined to retrieve pending data. */ public class LocalNotification { + public static boolean localNoticicationInvoked=false; + public static void startPolling(Context context) { int interval=10000; long firstTime = SystemClock.elapsedRealtime(); firstTime += 1000; - - Intent downloader = new Intent(context, AlarmReceiver.class); - PendingIntent recurringDownload = PendingIntent.getBroadcast(context, - 0, downloader, PendingIntent.FLAG_CANCEL_CURRENT); - AlarmManager alarms = (AlarmManager) context - .getSystemService(Context.ALARM_SERVICE); - alarms.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, firstTime, - interval, recurringDownload); + if(localNoticicationInvoked==false){ + localNoticicationInvoked=true; + Intent downloader = new Intent(context, AlarmReceiver.class); + PendingIntent recurringDownload = PendingIntent.getBroadcast(context, + 0, downloader, PendingIntent.FLAG_CANCEL_CURRENT); + AlarmManager alarms = (AlarmManager) context + .getSystemService(Context.ALARM_SERVICE); + alarms.setRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, firstTime, + interval, recurringDownload); + } } } diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/MessageProcessor.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/MessageProcessor.java index 4b4b68fe64..506f9650a1 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/MessageProcessor.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/services/MessageProcessor.java @@ -16,10 +16,14 @@ package org.wso2.cdm.agent.services; import java.io.File; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; import java.util.Map; import org.json.JSONArray; import org.json.JSONException; +import org.json.JSONObject; +import org.wso2.cdm.agent.R; import org.wso2.cdm.agent.RegistrationActivity; import org.wso2.cdm.agent.api.DeviceInfo; import org.wso2.cdm.agent.proxy.APIResultCallBack; @@ -82,11 +86,20 @@ public class MessageProcessor implements APIResultCallBack { * pending. */ public void getMessages() { - - ServerUtils.callSecuredAPI(context, CommonUtilities.SERVER_URL + CommonUtilities.NOTIFICATION_ENDPOINT+File.separator+deviceId, - CommonUtilities.POST_METHOD, null, MessageProcessor.this, + String ipSaved = + Preference.get(context.getApplicationContext(), + context.getResources().getString(R.string.shared_pref_ip)); + CommonUtilities.setServerURL(ipSaved); + String deviceIdentifier = ""; + try { + deviceIdentifier = URLEncoder.encode(deviceId, "utf-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ServerUtils.callSecuredAPI(context, CommonUtilities.API_SERVER_URL + + CommonUtilities.NOTIFICATION_ENDPOINT+File.separator+deviceIdentifier, + CommonUtilities.GET_METHOD, new JSONObject(), MessageProcessor.this, CommonUtilities.NOTIFICATION_REQUEST_CODE); - Log.e("sadfs",CommonUtilities.SERVER_URL + CommonUtilities.NOTIFICATION_ENDPOINT); } @Override diff --git a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java b/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java index a16f878114..9b58f15282 100644 --- a/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java +++ b/product/modules/agents/android/client/src/org/wso2/cdm/agent/utils/CommonUtilities.java @@ -47,7 +47,7 @@ public class CommonUtilities { public static String SENDER_ID_ENDPOINT = "devices/sender_id/"; public static String IS_REGISTERED_ENDPOINT = "devices/isregistered/"; public static String UNREGISTER_ENDPOINT = "devices/unregister/"; - public static String NOTIFICATION_ENDPOINT = "/operations/"+API_VERSION; + public static String NOTIFICATION_ENDPOINT = "/operation/"+API_VERSION; public static String SERVER_URL = SERVER_PROTOCOL + SERVER_IP + ":" + SERVER_PORT ; @@ -142,7 +142,7 @@ public class CommonUtilities { public static final String OPERATION_DEVICE_INFO = "500A"; public static final String OPERATION_DEVICE_LOCATION = "501A"; public static final String OPERATION_GET_APPLICATION_LIST = "502A"; - public static final String OPERATION_LOCK_DEVICE = "503A"; + public static final String OPERATION_LOCK_DEVICE = "DEVICE_LOCK"; public static final String OPERATION_WIPE_DATA = "504A";//reset device public static final String OPERATION_CLEAR_PASSWORD = "505A"; public static final String OPERATION_NOTIFICATION = "506A"; diff --git a/product/modules/mobileservices/agents/android/client/bin/cdm-agent.apk b/product/modules/mobileservices/agents/android/client/bin/cdm-agent.apk deleted file mode 100644 index 3771e2436d..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/cdm-agent.apk and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/classes.dex b/product/modules/mobileservices/agents/android/client/bin/classes.dex deleted file mode 100644 index 6f0921ffde..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/classes.dex and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar deleted file mode 100644 index a12962c9d6..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/android-support-v4-ac241410a4abbf80a4b32bc9c83281a0.jar and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar deleted file mode 100644 index 492e62a5bc..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/commons-codec-1.2-8ab7bcad84afcfb11444785a20fab16a.jar and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar deleted file mode 100644 index 86ff9d1320..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/gcm-9a0931d46c58ab74a433ccfc2b28f225.jar and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar deleted file mode 100644 index b5452950ae..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/json-simple-1.1.1-b2941873388ec1326a64a93caf86e8ae.jar and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar b/product/modules/mobileservices/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar deleted file mode 100644 index 258787fe22..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/dexedLibs/library-33cf4968ac75ef373184aa60c48ed2e2.jar and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/jarlist.cache b/product/modules/mobileservices/agents/android/client/bin/jarlist.cache index 21d5ff1dc2..723b67cf96 100644 --- a/product/modules/mobileservices/agents/android/client/bin/jarlist.cache +++ b/product/modules/mobileservices/agents/android/client/bin/jarlist.cache @@ -1,5 +1,5 @@ # cache for current jar dependency. DO NOT EDIT. # format is # Encoding is UTF-8 -1417676912000 484258 bd6479f5dd592790607e0504e66e0f31c2b4d308 /home/inoshp/Documents/work/EMM 2.0/Source/CDM/product-cdm/product/modules/agents/android/client/libs/android-support-v4.jar -1417676912000 484258 bd6479f5dd592790607e0504e66e0f31c2b4d308 /home/inoshp/Documents/work/EMM 2.0/Source/CDM/product-cdm/product/modules/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar +1421927786000 484258 bd6479f5dd592790607e0504e66e0f31c2b4d308 /home/inoshp/Documents/work/EMM 2.0/Source/CDM/product-mdm/product/modules/mobileservices/agents/android/client/libs/android-support-v4.jar +1421927786000 484258 bd6479f5dd592790607e0504e66e0f31c2b4d308 /home/inoshp/Documents/work/EMM 2.0/Source/CDM/product-mdm/product/modules/mobileservices/agents/android/client/plugins/ActionBarSherlock/library/libs/android-support-v4.jar diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png deleted file mode 100644 index e39a023452..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_bookmark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png deleted file mode 100644 index 74c9a0d459..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_default.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png deleted file mode 100644 index 5482cfb175..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_check_selected.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png deleted file mode 100644 index dc581a5c3a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png deleted file mode 100644 index 731d461bd4..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png deleted file mode 100644 index 731d461bd4..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_logo_dark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png deleted file mode 100644 index c031369cc7..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/ic_stat_gcm.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png deleted file mode 100644 index c06067326a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/option_icon.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png deleted file mode 100644 index 70274e215f..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/repeat_bg.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png deleted file mode 100644 index 79621a1269..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-hdpi/top_bar.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png deleted file mode 100644 index 6f3192e8dd..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_bookmark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png deleted file mode 100644 index 2e04208666..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_default.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png deleted file mode 100644 index 51cc587f23..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_check_selected.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 096b26b45f..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png deleted file mode 100644 index 846d41318a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png deleted file mode 100644 index 846d41318a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/ic_logo_dark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png deleted file mode 100644 index bbcd11bde0..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/option_icon.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png deleted file mode 100644 index 1a10ae8e0b..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-mdpi/top_bar.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png deleted file mode 100644 index 540a3132de..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appinstall.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png deleted file mode 100644 index 639d648523..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/applist.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png deleted file mode 100644 index 8f6ffef13e..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/appuninstall.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png deleted file mode 100644 index a4900b9292..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/camera.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png deleted file mode 100644 index e1bde62f55..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/changepassword.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png deleted file mode 100644 index 21c3c0ef86..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/encrypt.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png deleted file mode 100644 index f72001d8ec..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_bookmark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png deleted file mode 100644 index aa466a928e..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_default.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png deleted file mode 100644 index 3a7b7f9fad..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_check_selected.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 39b9a8f217..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png deleted file mode 100644 index 380beb5a90..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png deleted file mode 100644 index 380beb5a90..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/ic_logo_dark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png deleted file mode 100644 index ec33699635..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/info.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png deleted file mode 100644 index 7df708d9b6..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/location.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png deleted file mode 100644 index 9537c9a8df..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/lock.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png deleted file mode 100644 index 94c0417e2a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/mute.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png deleted file mode 100644 index f41ba8bef0..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/notification.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png deleted file mode 100644 index 5984849fbe..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/repeat_bg.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png deleted file mode 100644 index 217d097604..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wifi.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png deleted file mode 100644 index e48edc69c2..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xhdpi/wipe.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png deleted file mode 100644 index b3cc1456a1..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_bookmark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png deleted file mode 100644 index 6401f3a7a7..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_default.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png deleted file mode 100644 index 6a07c92553..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_check_selected.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 12fe35986b..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png deleted file mode 100644 index 0a305fefe7..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png deleted file mode 100644 index 0a305fefe7..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/ic_logo_dark.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png deleted file mode 100644 index 4b43a1295f..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable-xxhdpi/repeat_bg.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable/dot.png b/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable/dot.png deleted file mode 100644 index 9b8761da4a..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/res/crunch/drawable/dot.png and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/bin/resources.ap_ b/product/modules/mobileservices/agents/android/client/bin/resources.ap_ deleted file mode 100644 index 3e13d80784..0000000000 Binary files a/product/modules/mobileservices/agents/android/client/bin/resources.ap_ and /dev/null differ diff --git a/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java index c47ba61671..cf010dd243 100644 --- a/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java +++ b/product/modules/mobileservices/agents/android/client/src/org/wso2/cdm/agent/AuthenticationActivity.java @@ -28,7 +28,6 @@ import org.wso2.cdm.agent.proxy.IdentityProxy; import org.wso2.cdm.agent.services.AlarmReceiver; import org.wso2.cdm.agent.utils.CommonDialogUtils; import org.wso2.cdm.agent.utils.CommonUtilities; -import org.wso2.cdm.agent.utils.Constant; import org.wso2.cdm.agent.utils.HTTPConnectorUtils; import org.wso2.cdm.agent.utils.Preference; import org.wso2.cdm.agent.utils.ServerUtils;