Skip to content

Commit 62a4153

Browse files
author
Dominik Schürmann
committed
Fix crashes due to API 19, Version 2.4
1 parent c677d64 commit 62a4153

File tree

4 files changed

+35
-3
lines changed

4 files changed

+35
-3
lines changed

document-viewer/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
package="org.sufficientlysecure.viewer"
55
android:installLocation="auto"
6-
android:versionCode="2300"
7-
android:versionName="2.3">
6+
android:versionCode="2400"
7+
android:versionName="2.4">
88

99
<uses-sdk
1010
android:minSdkVersion="8"

document-viewer/assets/about/en/changelog.wiki

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#labels Featured
22
3+
= DV v2.4 =
4+
5+
== Bug fixes ==
6+
* Fix preference crashes
7+
38
= DV v2.3 =
49

510
== New features ==

document-viewer/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# project structure.
99

1010
# Project target.
11-
target=android-17
11+
target=android-19

document-viewer/src/org/ebookdroid/ui/settings/FragmentedSettingsActivity.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
12
package org.ebookdroid.ui.settings;
23

4+
import org.ebookdroid.ui.settings.fragments.BackupFragment;
5+
import org.ebookdroid.ui.settings.fragments.BasePreferenceFragment;
6+
import org.ebookdroid.ui.settings.fragments.BrowserFragment;
7+
import org.ebookdroid.ui.settings.fragments.NavFragment;
8+
import org.ebookdroid.ui.settings.fragments.OpdsFragment;
9+
import org.ebookdroid.ui.settings.fragments.PerformanceFragment;
10+
import org.ebookdroid.ui.settings.fragments.RenderFragment;
11+
import org.ebookdroid.ui.settings.fragments.ScrollFragment;
12+
import org.ebookdroid.ui.settings.fragments.TypeSpecificFragment;
13+
import org.ebookdroid.ui.settings.fragments.UIFragment;
314
import org.sufficientlysecure.viewer.R;
415

516
import android.annotation.TargetApi;
@@ -27,4 +38,20 @@ public boolean onIsMultiPane() {
2738
}
2839
return false;
2940
}
41+
42+
protected boolean isValidFragment(String fragmentName) {
43+
if (ScrollFragment.class.getName().equals(fragmentName)
44+
|| UIFragment.class.getName().equals(fragmentName)
45+
|| NavFragment.class.getName().equals(fragmentName)
46+
|| PerformanceFragment.class.getName().equals(fragmentName)
47+
|| TypeSpecificFragment.class.getName().equals(fragmentName)
48+
|| BackupFragment.class.getName().equals(fragmentName)
49+
|| BasePreferenceFragment.class.getName().equals(fragmentName)
50+
|| BrowserFragment.class.getName().equals(fragmentName)
51+
|| OpdsFragment.class.getName().equals(fragmentName)
52+
|| RenderFragment.class.getName().equals(fragmentName)) {
53+
return true;
54+
}
55+
return false;
56+
}
3057
}

0 commit comments

Comments
 (0)