From fdd5c4f526ea6da9fa509c86cbb7c7a044c7e1d2 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 22 Jul 2011 23:14:52 +0100
Subject: [PATCH] exception processing fixes

---
 AndroidManifest.xml                                       | 8 ++++----
 AndroidManifest.xml.pattern                               | 6 +++---
 VERSION                                                   | 2 +-
 .../zlibrary/core/application/ZLKeyBindings.java          | 6 +++++-
 .../ui/android/library/UncaughtExceptionHandler.java      | 2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 92354bb93..55c05ba1a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,17 +1,17 @@
 <?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="10103" android:versionName="1.1.3" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="10104" android:versionName="1.1.4" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="4" android:maxSdkVersion="10"/>
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
-		<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
-		<activity android:name="org.geometerplus.android.fbreader.crash.FixBooksDirectoryActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden">
+		<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" android:process=":crash" />
+		<activity android:name="org.geometerplus.android.fbreader.crash.FixBooksDirectoryActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" android:process=":crash">
 			<intent-filter>
 				<action android:name="android.fbreader.action.CRASH" />
 				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="crash" android:path="org.geometerplus.zlibrary.text.model.CachedCharStorageException" />
+				<data android:scheme="CachedCharStorageException" />
 			</intent-filter>
 		</activity>
 		<service android:name="org.geometerplus.android.fbreader.api.ApiService">
diff --git a/AndroidManifest.xml.pattern b/AndroidManifest.xml.pattern
index ac9ed078c..721a44cbe 100644
--- a/AndroidManifest.xml.pattern
+++ b/AndroidManifest.xml.pattern
@@ -6,12 +6,12 @@
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
-		<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
-		<activity android:name="org.geometerplus.android.fbreader.crash.FixBooksDirectoryActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden">
+		<activity android:name=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" android:process=":crash" />
+		<activity android:name="org.geometerplus.android.fbreader.crash.FixBooksDirectoryActivity" android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" android:process=":crash">
 			<intent-filter>
 				<action android:name="android.fbreader.action.CRASH" />
 				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="crash" android:path="org.geometerplus.zlibrary.text.model.CachedCharStorageException" />
+				<data android:scheme="CachedCharStorageException" />
 			</intent-filter>
 		</activity>
 		<service android:name="org.geometerplus.android.fbreader.api.ApiService">
diff --git a/VERSION b/VERSION
index 781dcb07c..65087b4f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.3
+1.1.4
diff --git a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
index b5171ef2e..a8d1beb39 100644
--- a/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
+++ b/src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
@@ -45,7 +45,11 @@ public final class ZLKeyBindings {
 		myName = name;
 		final Set<String> keys = new TreeSet<String>();
 		new Reader(keys).read(ZLFile.createFileByPath("default/keymap.xml"));
-		new Reader(keys).read(ZLFile.createFileByPath(Paths.BooksDirectoryOption().getValue() + "/keymap.xml"));
+		try {
+			new Reader(keys).read(ZLFile.createFileByPath(Paths.BooksDirectoryOption().getValue() + "/keymap.xml"));
+		} catch (Exception e) {
+			// ignore
+		}
  		myKeysOption = new ZLStringListOption(name, "KeyList", new ArrayList<String>(keys));
 
 		// this code is for migration from FBReader versions <= 1.1.2
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java b/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
index 905c2b406..b8886d4b7 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
@@ -39,7 +39,7 @@ public class UncaughtExceptionHandler implements java.lang.Thread.UncaughtExcept
 
 		Intent intent = new Intent(
 			"android.fbreader.action.CRASH",
-			new Uri.Builder().scheme("crash").appendPath(exception.getClass().getName()).build()
+			new Uri.Builder().scheme(exception.getClass().getSimpleName()).build()
 		);
 		try {
 			myContext.startActivity(intent);