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

Merge branch 'master' into ice-cream-sandwich

Browse source 
Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
This commit is contained in:
Nikolay Pultsin 2013-02-01 15:59:04 +00:00
commit 38049e71a5
103 changed files with 503 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,6 +139,7 @@ public class PopupWindow extends LinearLayout {
}
});
}
private void hideInternal() {
if (myAnimated) {
if (myShowHideAnimator != null) {

6
src/org/geometerplus/zlibrary/core/filesystem/tar/ZLTarHeader.java
View file

@ -73,12 +73,12 @@ class ZLTarHeader {
if (linkFlag == -1) {
return false;
}
IsRegularFile = (linkFlag == 0) || (linkFlag == (byte)'0');
IsRegularFile = linkFlag == 0 || linkFlag == (byte)'0';
stream.skip(355);
if (((linkFlag == (byte)'L') ||
(linkFlag == (byte)'K')) && (Name == "././@LongLink") && (Size < 10240)) {
if ((linkFlag == (byte)'L' || linkFlag == (byte)'K')
&& "././@LongLink".equals(Name) && Size < 10240) {
final byte[] nameBuffer = new byte[Size - 1];
stream.read(nameBuffer);
Name = getStringFromByteArray(nameBuffer);