From 0fb0c57c9d00bb87908a5476d726315a576df3a7 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Mon, 13 Sep 2010 21:35:41 +0000
Subject: [PATCH] fixed file opening for fb2.zip/fb2 from ASTRO file manager
 0.7.1

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1741 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 AndroidManifest.xml                                      | 9 ++++++++-
 AndroidManifest.xml.pattern                              | 7 +++++++
 VERSION                                                  | 2 +-
 .../zlibrary/ui/android/library/ZLAndroidActivity.java   | 7 +++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 16f5541e4..399167b97 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="700" android:versionName="0.7.0" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="701" android:versionName="0.7.1" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="3" />
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
 	<uses-permission android:name="android.permission.INTERNET" />
@@ -24,6 +24,13 @@
 				<data android:pathPattern=".*\\.mobi" />
 				<data android:pathPattern=".*\\.prc" />
 			</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:scheme="content" />
+				<data android:pathPattern=".*\\.fb2" />
+			</intent-filter>
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index f1ee49657..80082beb2 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -24,6 +24,13 @@
 				<data android:pathPattern=".*\\.mobi" />
 				<data android:pathPattern=".*\\.prc" />
 			</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:scheme="content" />
+				<data android:pathPattern=".*\\.fb2" />
+			</intent-filter>
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/VERSION b/VERSION
index faef31a43..39e898a4f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.7.0
+0.7.1
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
index 2a8358f38..7791a0db1 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
@@ -70,6 +70,13 @@ public abstract class ZLAndroidActivity extends Activity {
 			final Uri uri = intent.getData();
 			if (uri != null) {
 				fileToOpen = uri.getPath();
+                final String scheme = uri.getScheme();
+                if ("content".equals(scheme)) {
+                    final File file = new File(fileToOpen);
+                    if (!file.exists()) {
+                        fileToOpen = file.getParent();
+                    }
+                }
 			}
 			intent.setData(null);
 		}