Merge pull request #354 from inoshperera/master

fixing app catelog app issues
wso2-attic · Nov 29, 2016 · 562c7c9 · 562c7c9
2 parents c118270 + c24bca7
commit 562c7c9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/modules/mobile-agents/android/app-catalog/app/build.gradle b/modules/mobile-agents/android/app-catalog/app/build.gradle
@@ -30,7 +30,7 @@ dependencies {
         exclude module: 'junit'
     }
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.0.0-alpha1'
+    compile 'com.android.support:appcompat-v7:23.0.0'
     compile 'com.fasterxml.jackson.core:jackson-core:2.6.0-rc3'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.6.0-rc3'
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0-rc3'

diff --git a/...le-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/AppListActivity.java b/...le-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/AppListActivity.java
@@ -270,7 +270,7 @@ private void setAppListUI(JSONArray payload) {
                     if (webAppCategories != null && !webAppCategories.contains(application.getCategory())) {
                         webAppCategories.add(application.getCategory());
                     }
-                } else {
+                } else if (Constants.ApplicationPayload.PLATFORM_ANDROID.equals(application.getPlatform())){
                     mobileApps.add(application);
                     if (mobileAppCategories != null && !mobileAppCategories.contains(application.getCategory())) {
                         mobileAppCategories.add(application.getCategory());

diff --git a/...-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/utils/CommonUtils.java b/...-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/utils/CommonUtils.java
@@ -164,7 +164,7 @@ public static void callAgentApp(Context context, String operation, String appUri
 			intent = explicitIntent;
 		}
 
-		intent.putExtra("code", operation);
+		intent.putExtra("operation", operation);
 		intent.setPackage(Constants.PACKAGE_NAME);
 
 		if (appUri != null) {

diff --git a/...le-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/utils/Constants.java b/...le-agents/android/app-catalog/app/src/main/java/org/wso2/app/catalog/utils/Constants.java
@@ -33,7 +33,7 @@ public class Constants {
 	public static final String SERVER_APP_ENDPOINT = "/api/appm/";
 	public static final String OAUTH_ENDPOINT = "/oauth2/token";
 	public static final String GOOGLE_PLAY_APP_URI = "market://details?id=";
-	public static final String APP_LIST_ENDPOINT = "/api/appm/publisher/v1.0/apps/mobileapp?field-filter=all";
+	public static final String APP_LIST_ENDPOINT = "/api/appm/publisher/v1.1/apps/mobileapp?field-filter=all";
 	public static final String APP_IMAGE_ENDPOINT = "/publisher/api/mobileapp/getfile/";
 	// This is set to override the server host name retrieving screen. If overriding is not
 	// needed, set this to null.
@@ -130,5 +130,6 @@ private ApplicationPayload() {
 		public static final String PACKAGE = "package";
 		public static final String TYPE_MOBILE_APP = "enterprise";
 		public static final String TYPE_WEB_CLIP = "webapp";
+		public static final String PLATFORM_ANDROID = "android";
 	}
 }
diff --git a/modules/mobile-agents/android/app-catalog/build.gradle b/modules/mobile-agents/android/app-catalog/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/modules/mobile-agents/android/app-catalog/iDPProxy/build.gradle b/modules/mobile-agents/android/app-catalog/iDPProxy/build.gradle
@@ -17,7 +17,7 @@
  */
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 22
+    compileSdkVersion 23
     buildToolsVersion "23.0.3"
 
     defaultConfig {

diff --git a/modules/mobile-agents/android/app-catalog/volley/build.gradle b/modules/mobile-agents/android/app-catalog/volley/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
@@ -31,7 +31,7 @@ repositories {
 
 android {
     compileSdkVersion 22
-    buildToolsVersion = '22.0.1'
+    buildToolsVersion = '23.0.3'
 }
 
 apply from: 'rules.gradle'

diff --git a/...mobile-agents/android/client/client/src/main/java/org/wso2/emm/agent/utils/Constants.java b/...mobile-agents/android/client/client/src/main/java/org/wso2/emm/agent/utils/Constants.java
@@ -110,7 +110,7 @@ private SplunkConfigs(){
 	public static final String NOTIFICATION_ENDPOINT  = "/pending-operations";
 	public static final String GOOGLE_PLAY_APP_URI = "market://details?id=";
 	public static final String DYNAMIC_CLIENT_REGISTER_ENDPOINT = "/dynamic-client-web/register";
-	public static final String APP_LIST_ENDPOINT = "/api/appm/publisher/v1.0/apps/mobileapp?field-filter=all";
+	public static final String APP_LIST_ENDPOINT = "/api/appm/publisher/v1.1/apps/mobileapp?field-filter=all";
 	public static final String APP_DOWNLOAD_ENDPOINT = "/publisher/api/mobileapp/getfile";
 	public static final String ACTION_RESPONSE = "org.wso2.emm.agent.MESSAGE_PROCESSED";
 	public static final String POLICY_ENDPOINT = SERVER_APP_ENDPOINT + "policy/";