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

Merge branch 'master' of github.com:geometer/FBReaderJ

Browse source
This commit is contained in:
Vasiliy Bout 2010-10-07 13:19:08 +04:00
commit 0bb412732e
6 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
AndroidManifest.xml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?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="706" android:versionName="0.7.6" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="707" android:versionName="0.7.7" android:installLocation="auto">
<uses-sdk android:minSdkVersion="3" /> <uses-sdk android:minSdkVersion="3" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true" /> <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.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader"> <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=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden"> <activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden">

1
AndroidManifest.xml.pattern
View file

@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader"> <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=".library.BugReportActivity" android:label="FBReader crash" android:configChanges="orientation|keyboardHidden" />
<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden"> <activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden">

6
ChangeLog
View file

@ -1,7 +1,11 @@
===== 0.7.6 (??? ??, ????) ===== ===== 0.7.7 (Oct 06, 2010) =====
* Power consumption has been fixed
===== 0.7.6 (Oct 05, 2010) =====
* Application icon with better resolution has been added * Application icon with better resolution has been added
* Czech localization (by Marek Pavelka) has been added * Czech localization (by Marek Pavelka) has been added
* Loading of large catalogs (e.g., Manybooks->Authors->L) has been fixed * Loading of large catalogs (e.g., Manybooks->Authors->L) has been fixed
* Default e-mail will be used during registration at litres
===== 0.7.5 (Sep 22, 2010) ===== ===== 0.7.5 (Sep 22, 2010) =====
* Mistyping in Russian help has been fixed * Mistyping in Russian help has been fixed

2
VERSION
View file

@ -1 +1 @@
0.7.6 0.7.7

1
src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -168,6 +168,7 @@ public final class FBReader extends ZLAndroidActivity {
public void onPause() { public void onPause() {
if (myWakeLock != null) { if (myWakeLock != null) {
myWakeLock.release(); myWakeLock.release();
myWakeLock = null;
} }
ControlButtonPanel.saveVisibilities(); ControlButtonPanel.saveVisibilities();
super.onPause(); super.onPause();

2
src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java
View file

@ -176,7 +176,7 @@ class RegisterUserDialog extends NetworkDialog {
@Override @Override
public void prepareDialogInternal(Dialog dialog) { public void prepareDialogInternal(Dialog dialog) {
dialog.findViewById(R.id.network_register_email_button).setVisibility((mySystemEmails.size() > 1) ? View.VISIBLE : View.GONE); dialog.findViewById(R.id.network_register_email_button).setVisibility((mySystemEmails.size() > 1) ? View.VISIBLE : View.GONE);
if (mySystemEmails.size() == 1 && (myEmail == null || myEmail.length() == 0)) { if (!mySystemEmails.isEmpty() && (myEmail == null || myEmail.length() == 0)) {
myEmail = mySystemEmails.get(0); myEmail = mySystemEmails.get(0);
} }