From 8dd30b0a4bb156316f4de8db7315fa401ac11707 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jrywjwu@gmail.com>
Date: Sat, 11 Jul 2015 02:59:59 +0800
Subject: [PATCH] Update file association settings

---
 LimeStudio/app/src/main/AndroidManifest.xml   | 79 ++++++-------------
 .../java/net/toload/main/hd/MainActivity.java |  2 +-
 2 files changed, 25 insertions(+), 56 deletions(-)

diff --git a/LimeStudio/app/src/main/AndroidManifest.xml b/LimeStudio/app/src/main/AndroidManifest.xml
index 028ff3a2..0ff74ba8 100644
--- a/LimeStudio/app/src/main/AndroidManifest.xml
+++ b/LimeStudio/app/src/main/AndroidManifest.xml
@@ -72,68 +72,37 @@
                 <data android:mimeType="text/plain" />
             </intent-filter>
             <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/octet-stream" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:host="*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content" />
-                <data android:scheme="file" />
-                <data android:host="*" />
-                <data android:mimeType="*/*" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:mimeType="text/*"/>
                 <data android:pathPattern=".*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\.cin" />
-                <data android:pathPattern=".*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.cin" />
                 <data android:pathPattern=".*\\.lime" />
-                <data android:pathPattern=".*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.lime" />
+                <data android:pathPattern=".*\\.cin" />
+                <data android:scheme="file"/>
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data android:scheme="ftp" />
-                <data android:scheme="file" />
-                <data android:host="*" />
-                <data android:mimeType="*/*" />
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
                 <data android:pathPattern=".*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.limedb" />
-                <data android:pathPattern=".*\\.cin" />
-                <data android:pathPattern=".*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.cin" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.cin" />
                 <data android:pathPattern=".*\\.lime" />
-                <data android:pathPattern=".*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.lime" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.lime" />
+                <data android:pathPattern=".*\\.cin" />
+                <data android:scheme="file"/>
+            </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="gmail-ls" android:mimeType="application/octet-stream" android:scheme="content"/>
+            </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="gmail-ls" android:mimeType="text/*" android:scheme="content"/>
             </intent-filter>
+
         </activity>
 
         <!-- LIME Services -->
diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/MainActivity.java b/LimeStudio/app/src/main/java/net/toload/main/hd/MainActivity.java
index 77169d86..bf9cc79d 100644
--- a/LimeStudio/app/src/main/java/net/toload/main/hd/MainActivity.java
+++ b/LimeStudio/app/src/main/java/net/toload/main/hd/MainActivity.java
@@ -282,7 +282,7 @@ protected void onCreate(Bundle savedInstanceState) {
                 Uri uri = intent.getData();
                 String fileName = getContentName(resolver, uri);
                 if(fileName==null) {
-                    uri.getLastPathSegment();
+                    fileName=uri.getLastPathSegment();
                 }
                 InputStream input = null;
                 try {