diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml.in | 75 | ||||
| -rw-r--r-- | java/org/gnu/emacs/EmacsOpenActivity.java | 4 |
2 files changed, 14 insertions, 65 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index 2cbcdbc3e5b..21bb2af2530 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in @@ -107,73 +107,18 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> <action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.EDIT"/> <action android:name="android.intent.action.PICK"/> - <category android:name="android.intent.category.DEFAULT"/> + <data android:mimeType="*/*"/> + </intent-filter> + + <!-- Facilitate opening org-protocol:// URLs as well, the same + way emacsclient.desktop does. --> - <data android:mimeType="image/aces"/> - <data android:mimeType="image/avci"/> - <data android:mimeType="image/avcs"/> - <data android:mimeType="image/avif"/> - <data android:mimeType="image/bmp"/> - <data android:mimeType="image/cgm"/> - <data android:mimeType="image/dicom-rle"/> - <data android:mimeType="image/dpx"/> - <data android:mimeType="image/emf"/> - <data android:mimeType="image/example"/> - <data android:mimeType="image/fits"/> - <data android:mimeType="image/g3fax"/> - <data android:mimeType="image/heic"/> - <data android:mimeType="image/heic-sequence"/> - <data android:mimeType="image/heif"/> - <data android:mimeType="image/heif-sequence"/> - <data android:mimeType="image/hej2k"/> - <data android:mimeType="image/hsj2"/> - <data android:mimeType="image/jls"/> - <data android:mimeType="image/jp2"/> - <data android:mimeType="image/jph"/> - <data android:mimeType="image/jphc"/> - <data android:mimeType="image/jpm"/> - <data android:mimeType="image/jpx"/> - <data android:mimeType="image/jxr"/> - <data android:mimeType="image/jxrA"/> - <data android:mimeType="image/jxrS"/> - <data android:mimeType="image/jxs"/> - <data android:mimeType="image/jxsc"/> - <data android:mimeType="image/jxsi"/> - <data android:mimeType="image/jxss"/> - <data android:mimeType="image/ktx"/> - <data android:mimeType="image/ktx2"/> - <data android:mimeType="image/naplps"/> - <data android:mimeType="image/png"/> - <data android:mimeType="image/prs.btif"/> - <data android:mimeType="image/prs.pti"/> - <data android:mimeType="image/pwg-raster"/> - <data android:mimeType="image/svg+xml"/> - <data android:mimeType="image/t38"/> - <data android:mimeType="image/tiff"/> - <data android:mimeType="image/tiff-fx"/> - <data android:mimeType="image/xpm"/> - <data android:mimeType="text/*"/> - <data android:mimeType="application/*xml"/> - <data android:mimeType="application/atom+xml"/> - <data android:mimeType="application/dxf"/> - <data android:mimeType="application/ecmascript"/> - <data android:mimeType="application/javascript"/> - <data android:mimeType="application/json"/> - <data android:mimeType="application/*log*"/> - <data android:mimeType="application/octet-stream"/> - <data android:mimeType="application/soap+xm"/> - <data android:mimeType="application/x-caramel"/> - <data android:mimeType="application/x-klaunch"/> - <data android:mimeType="application/x-latex"/> - <data android:mimeType="application/x-sh"/> - <data android:mimeType="application/x-tcl"/> - <data android:mimeType="application/x-tex*"/> - <data android:mimeType="application/x-troff*"/> - <data android:mimeType="application/xhtml+xml"/> - <data android:mimeType="application/xml*"/> - <data android:mimeType="application/zip"/> - <data android:mimeType="application/x-zip-compressed"/> + <intent-filter> + <action android:name="android.intent.action.VIEW"/> + <category android:name="android.intent.category.DEFAULT"/> + <category android:name="android.intent.category.BROWSABLE"/> + <data android:scheme="org-protocol"/> </intent-filter> </activity> diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java index ea503ebd120..ca6d99e20b7 100644 --- a/java/org/gnu/emacs/EmacsOpenActivity.java +++ b/java/org/gnu/emacs/EmacsOpenActivity.java @@ -477,6 +477,10 @@ public final class EmacsOpenActivity extends Activity } } } + else if (uri.getScheme ().equals ("org-protocol")) + /* URL is an org-protocol:// link, which is meant to be + directly relayed to emacsclient. */ + fileName = uri.toString (); if (fileName == null) { |