merge with upstream, ext doc dialog 3

Author: plotn

android/app/build.gradle

@@ -10,8 +10,8 @@ android {
         multiDexEnabled true
         // When new version released, version code must be incremented at least by 8
         // for compatibility with ABI versioning of split apk (see below).
-        versionCode 32380
-        versionName "3.2.38-1"
+        versionCode 32390
+        versionName "3.2.39-1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

android/app/libs/OpenDocument.jar

@@ -493,6 +493,7 @@
 
                 <data android:host="*" android:scheme="file" />
                 <data android:host="*" android:scheme="content" />
+                <data android:host="*" android:scheme="http" />
 
                 <data android:pathPattern="/.*\\.txt" />
                 <data android:pathPattern="/.*\\..*\\.txt" />
@@ -518,6 +519,13 @@
                 <data android:scheme="content" />
                 <data android:mimeType="text/plain" />
             </intent-filter>
+            <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:host="*" android:scheme="http"/>
+                <data android:mimeType="text/plain" />
+            </intent-filter>
         </activity-alias>
         <!-- alias activity to disable HTML -->
         <activity-alias