commit 025fed39721c4b5a19104807c7d2e46b11be2afe
author Axesh  R. Ajmera <aajmera@codeaurora.org> Thu Sep 04 11:18:47 2014 -0700
committer WebTech Code Review <code-review@localhost> Mon Sep 29 08:48:16 2014 -0700
tree 0f1ffc5b448370de9ac586522abb4748928e499a
parent 0c73c7cf9093604173f08a16fc3d7bca2713b950

Fix for upload handler

Change-Id: I04689ba507719f3cb55683acf1e8427b1e2c6e07

src/com/android/browser/UploadDialog.java

diff --git a/src/com/android/browser/UploadDialog.java b/src/com/android/browser/UploadDialog.java
index d96c486..a91613e 100644
--- a/src/com/android/browser/UploadDialog.java
+++ b/src/com/android/browser/UploadDialog.java
@@ -41,7 +41,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class UploadDialog extends AppItem {
@@ -55,21 +54,8 @@
         this.apps = null;
     }
 
-    public void getUploadableApps(List<Intent> intents) {
-
-        ArrayList<ResolveInfo> uploadApps = new ArrayList<ResolveInfo>();
-
-        PackageManager pm = activity.getPackageManager();
-
-        for (Intent currentIntent: intents) {
-            List<ResolveInfo> appsList = pm.queryIntentActivities(currentIntent,
-                PackageManager.MATCH_DEFAULT_ONLY);
-            for (ResolveInfo res : appsList) {
-                uploadApps.add(res);
-            }
-        }
-
-        this.apps = uploadApps;
+    public void getUploadableApps(List<ResolveInfo> apps, List<Intent> intents) {
+        this.apps = apps;
         this.uploadIntents = intents;
     }
 
@@ -78,7 +64,6 @@
         final AppAdapter adapter = new AppAdapter(activity, activity.getPackageManager(),
                                     R.layout.app_row, this.apps);
 
-
         AlertDialog.Builder builderSingle = new AlertDialog.Builder(activity);
         builderSingle.setIcon(R.mipmap.ic_launcher_browser_swe);
         builderSingle.setTitle(activity.getString(R.string.choose_upload));
@@ -87,12 +72,10 @@
             @Override
             public void onClick(DialogInterface dialog, int position) {
                 dialog.dismiss();
-                Intent chooserIntent = Intent.createChooser(uploadIntents.get(position), "Upload Via");
-                uploadHandler.initiateActivity(chooserIntent);
+                uploadHandler.initiateActivity(uploadIntents.get(position));
             }
         });
 
-
         builderSingle.setOnCancelListener(new DialogInterface.OnCancelListener()
             {
                @Override
@@ -104,6 +87,5 @@
         });
 
         builderSingle.show();
-
     }
 }
\ No newline at end of file