Use chooser for sharing logs

msdgwzhy6 · Sep 23, 2015 · 70dd957 · 70dd957
1 parent f24404f
commit 70dd957
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/internalDebug/java/com/jakewharton/u2020/ui/logs/LogsDialog.java b/src/internalDebug/java/com/jakewharton/u2020/ui/logs/LogsDialog.java
@@ -1,10 +1,10 @@
 package com.jakewharton.u2020.ui.logs;
 
-import android.support.v7.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v7.app.AlertDialog;
 import android.widget.ListView;
 import android.widget.Toast;
 import com.jakewharton.u2020.data.LumberYard;
@@ -79,7 +79,7 @@ private void share() {
             Intent sendIntent = new Intent(Intent.ACTION_SEND);
             sendIntent.setType("text/plain");
             sendIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file));
-            Intents.maybeStartActivity(getContext(), sendIntent);
+            Intents.maybeStartChooser(getContext(), sendIntent);
           }
         });
   }

diff --git a/src/main/java/com/jakewharton/u2020/util/Intents.java b/src/main/java/com/jakewharton/u2020/util/Intents.java
@@ -15,7 +15,23 @@ public final class Intents {
    * will display a simple message if none are available to handle it.
    */
   public static boolean maybeStartActivity(Context context, Intent intent) {
+    return maybeStartActivity(context, intent, false);
+  }
+
+  /**
+   * Attempt to launch Android's chooser for the supplied {@link Intent}. Queries on-device
+   * packages before launching and will display a simple message if none are available to handle
+   * it.
+   */
+  public static boolean maybeStartChooser(Context context, Intent intent) {
+    return maybeStartActivity(context, intent, true);
+  }
+
+  private static boolean maybeStartActivity(Context context, Intent intent, boolean chooser) {
     if (hasHandler(context, intent)) {
+      if (chooser) {
+        intent = Intent.createChooser(intent, null);
+      }
       context.startActivity(intent);
       return true;
     } else {
@@ -27,7 +43,7 @@ public static boolean maybeStartActivity(Context context, Intent intent) {
   /**
    * Queries on-device packages for a handler for the supplied {@link Intent}.
    */
-  public static boolean hasHandler(Context context, Intent intent) {
+  private static boolean hasHandler(Context context, Intent intent) {
     List<ResolveInfo> handlers = context.getPackageManager().queryIntentActivities(intent, 0);
     return !handlers.isEmpty();
   }