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

cleanup

Browse source 
Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
This commit is contained in:
Nikolay Pultsin 2013-06-12 19:22:58 +04:00
parent fab9fe4428
commit 1eeb00dd3d
17 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/org/amse/ys/zip/NoCompressionDecompressor.java
View file

@ -13,6 +13,7 @@ public class NoCompressionDecompressor extends Decompressor {
myStream = is;
}
@Override
public int read(byte b[], int off, int len) throws IOException {
int i = 0;
for (; i < len; ++i) {
@ -27,6 +28,7 @@ public class NoCompressionDecompressor extends Decompressor {
return (i > 0) ? i : -1;
}
@Override
public int read() throws IOException {
if (myCurrentPosition < myHeader.CompressedSize) {
myCurrentPosition++;
@ -36,6 +38,7 @@ public class NoCompressionDecompressor extends Decompressor {
}
}
@Override
public int available() throws IOException {
return (myHeader.UncompressedSize - myCurrentPosition);
}

7
src/org/geometerplus/android/fbreader/BookmarksActivity.java
View file

@ -206,6 +206,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
getTabHost().setCurrentTabByTag("found");
}
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case 1:
@ -340,6 +341,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
}
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
final View view = (convertView != null) ? convertView :
LayoutInflater.from(parent.getContext()).inflate(R.layout.bookmark_item, parent, false);
@ -366,18 +368,22 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
return view;
}
@Override
public final boolean areAllItemsEnabled() {
return true;
}
@Override
public final boolean isEnabled(int position) {
return true;
}
@Override
public final long getItemId(int position) {
return position;
}
@Override
public final Bookmark getItem(int position) {
if (myShowAddBookmarkItem) {
--position;
@ -385,6 +391,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
return (position >= 0) ? myBookmarks.get(position) : null;
}
@Override
public final int getCount() {
return myShowAddBookmarkItem ? myBookmarks.size() + 1 : myBookmarks.size();
}

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

@ -19,7 +19,6 @@
package org.geometerplus.android.fbreader;
import java.lang.reflect.*;
import java.util.*;
import android.app.Activity;
@ -34,10 +33,8 @@ import android.widget.RelativeLayout;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.text.view.ZLTextView;
import org.geometerplus.zlibrary.text.hyphenation.ZLTextHyphenator;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow;

3
src/org/geometerplus/android/fbreader/FBReaderApplication.java
View file

@ -19,10 +19,7 @@
package org.geometerplus.android.fbreader;
import android.content.Intent;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
import org.geometerplus.android.fbreader.libraryService.LibraryService;
public class FBReaderApplication extends ZLAndroidApplication {
}

2
src/org/geometerplus/android/fbreader/ProcessHyperlinkAction.java
View file

@ -23,8 +23,6 @@ import android.content.Intent;
import android.content.ActivityNotFoundException;
import android.net.Uri;
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.fbreader.fbreader.FBReaderApp;

2
src/org/geometerplus/android/fbreader/SetOrientationAction.java
View file

@ -25,8 +25,6 @@ import android.content.pm.ActivityInfo;
import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.geometerplus.zlibrary.core.util.ZLBoolean3;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
class SetScreenOrientationAction extends FBAndroidAction {

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

@ -21,7 +21,6 @@ package org.geometerplus.android.fbreader;
import android.app.ListActivity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.*;
import android.widget.*;

1
src/org/geometerplus/android/fbreader/covers/CoverHolder.java
View file

@ -19,7 +19,6 @@
package org.geometerplus.android.fbreader.covers;
import java.util.*;
import java.util.concurrent.Future;
import android.widget.ImageView;

5
src/org/geometerplus/android/fbreader/covers/CoverManager.java
View file

@ -19,10 +19,7 @@
package org.geometerplus.android.fbreader.covers;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.*;
import android.app.Activity;
import android.graphics.Bitmap;

4
src/org/geometerplus/android/fbreader/crash/MissingNativeLibraryActivity.java
View file

@ -27,12 +27,8 @@ import android.widget.TextView;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.fbreader.Paths;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.fbreader.FBReader;
public class MissingNativeLibraryActivity extends Activity {
@Override
protected void onCreate(Bundle bundle) {

2
src/org/geometerplus/android/fbreader/image/ImageViewActivity.java
View file

@ -27,9 +27,7 @@ import android.os.Bundle;
import android.util.FloatMath;
import android.view.*;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.image.*;
import org.geometerplus.zlibrary.core.util.MimeType;
import org.geometerplus.zlibrary.core.util.ZLColor;
import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary;

1
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -28,7 +28,6 @@ import android.widget.AdapterView;
import android.widget.ListView;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.R;

1
src/org/geometerplus/android/fbreader/library/LibraryTreeAdapter.java
View file

@ -19,7 +19,6 @@
package org.geometerplus.android.fbreader.library;
import android.graphics.Bitmap;
import android.text.Html;
import android.view.*;
import android.widget.*;

1
src/org/geometerplus/android/fbreader/network/AuthenticationActivity.java
View file

@ -32,7 +32,6 @@ import android.widget.Button;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.fbreader.network.INetworkLink;
import org.geometerplus.fbreader.network.NetworkLibrary;

4
src/org/geometerplus/android/fbreader/network/AuthorizationMenuActivity.java
View file

@ -19,13 +19,9 @@
package org.geometerplus.android.fbreader.network;
import java.util.*;
import android.app.Activity;
import android.content.*;
import android.net.Uri;
import android.view.*;
import android.widget.*;
import org.geometerplus.fbreader.network.INetworkLink;
import org.geometerplus.fbreader.network.NetworkLibrary;

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

@ -42,8 +42,6 @@ import org.geometerplus.fbreader.network.tree.NetworkBookTree;
import org.geometerplus.fbreader.network.urlInfo.BookBuyUrlInfo;
import org.geometerplus.fbreader.network.authentication.NetworkAuthenticationManager;
import org.geometerplus.android.fbreader.network.*;
public class BuyBooksActivity extends Activity implements NetworkLibrary.ChangeListener {
public static void run(Activity activity, NetworkBookTree tree) {
run(activity, Collections.singletonList(tree));

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

@ -35,6 +35,7 @@ public class UncaughtExceptionHandler implements java.lang.Thread.UncaughtExcept
myContext = context;
}
@Override
public void uncaughtException(Thread thread, Throwable exception) {
final StringWriter stackTrace = new StringWriter();
exception.printStackTrace(new PrintWriter(stackTrace));