Update Android port

* java/org/gnu/emacs/EmacsService.java (browseUrl): New argument
SEND.  Choose from a list of applications that want to share the
URL if true.
* lisp/net/browse-url.el (browse-url-android-share): New user
option.
(browse-url-default-android-browser): Respect said user option.
* src/android.c (android_init_emacs_service)
(android_browse_url): Expose new option.
* src/android.h: Update prototypes.
* src/androidselect.c (Fandroid_browse_url): Likewise.

3 files changed, 21 insertions, 13 deletions

diff --git a/src/android.c b/src/android.c
index 5850b6079c9..4e9897f4648 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2286,7 +2286,7 @@ android_init_emacs_service (void)
   FIND_METHOD (get_screen_height, "getScreenHeight", "(Z)I");
   FIND_METHOD (detect_mouse, "detectMouse", "()Z");
   FIND_METHOD (name_keysym, "nameKeysym", "(I)Ljava/lang/String;");
-  FIND_METHOD (browse_url, "browseUrl", "(Ljava/lang/String;)"
+  FIND_METHOD (browse_url, "browseUrl", "(Ljava/lang/String;Z)"
                "Ljava/lang/String;");
   FIND_METHOD (restart_emacs, "restartEmacs", "()V");
   FIND_METHOD (update_ic, "updateIC",
@@ -6959,12 +6959,15 @@ android_project_image_nearest (struct android_image *image,
 
 /* Other miscellaneous functions.  */
 
-/* Ask the system to start browsing the specified encoded URL.  Upon
-   failure, return a string describing the error.  Else, value is
-   nil.  */
+/* Ask the system to start browsing the specified URL.  Upon failure,
+   return a string describing the error.  Else, value is nil.  URL
+   should be encoded unless SEND.
+
+   If SEND, open the URL with applications that can ``send'' or
+   ``share'' the URL (through mail, for example.)  */
 
 Lisp_Object
-android_browse_url (Lisp_Object url)
+android_browse_url (Lisp_Object url, Lisp_Object send)
 {
   jobject value, string;
   Lisp_Object tem;
@@ -6974,7 +6977,8 @@ android_browse_url (Lisp_Object url)
   value = (*android_java_env)->CallObjectMethod (android_java_env,
                                                  emacs_service,
                                                  service_class.browse_url,
-                                                 string);
+                                                 string,
+                                                 (jboolean) !NILP (send));
   android_exception_check ();
 
   ANDROID_DELETE_LOCAL_REF (string);
diff --git a/src/android.h b/src/android.h
index 33ca379e6ba..2323690fa25 100644
--- a/src/android.h
+++ b/src/android.h
@@ -178,7 +178,7 @@ struct android_battery_state
   int temperature;
 };
 
-extern Lisp_Object android_browse_url (Lisp_Object);
+extern Lisp_Object android_browse_url (Lisp_Object, Lisp_Object);
 extern int android_query_battery (struct android_battery_state *);
 extern void android_display_toast (const char *);
 
diff --git a/src/androidselect.c b/src/androidselect.c
index d1f2ebb52f9..f5371280457 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -232,11 +232,15 @@ DEFUN ("android-clipboard-exists-p", Fandroid_clipboard_exists_p,
 }
 
 DEFUN ("android-browse-url", Fandroid_browse_url,
-       Sandroid_browse_url, 1, 1, 0,
-       doc: /* Start the system web browser.
-Then, point the web browser to URL, which should be a URL-encoded
-URL with a scheme specified.  Signal an error upon failure.  */)
-  (Lisp_Object url)
+       Sandroid_browse_url, 1, 2, 0,
+       doc: /* Open URL in an external application.  URL should be a
+URL-encoded URL with a scheme specified unless SEND is non-nil.
+Signal an error upon failure.
+
+If SEND is nil, start a program that is able to display the URL, such
+as a web browser.  Otherwise, try to share URL using programs such as
+email clients.  */)
+  (Lisp_Object url, Lisp_Object send)
 {
   Lisp_Object value;
 
@@ -244,7 +248,7 @@ URL with a scheme specified.  Signal an error upon failure.  */)
     error ("No Android display connection!");
 
   CHECK_STRING (url);
-  value = android_browse_url (url);
+  value = android_browse_url (url, send);
 
   /* Signal an error upon failure.  */
   if (!NILP (value))