yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 19:42:17 +02:00
Code Issues Releases Wiki Activity

exception processing fixes

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-22 23:14:52 +01:00
parent 90372fbc97
commit fdd5c4f526
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
AndroidManifest.xml
View file

@ -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">

6
AndroidManifest.xml.pattern
View file

@ -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">

2
VERSION
View file

@ -1 +1 @@
1.1.3
1.1.4

6
src/org/geometerplus/zlibrary/core/application/ZLKeyBindings.java
View file

@ -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

2
src/org/geometerplus/zlibrary/ui/android/library/UncaughtExceptionHandler.java
View file

@ -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);