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

sync with premium version

Browse source
This commit is contained in:
Nikolay Pultsin 2015-10-01 00:53:29 +01:00
parent 3406bc5e8f
commit b995c9dd3c
5 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java
View file

@ -36,7 +36,6 @@ import org.geometerplus.zlibrary.ui.android.image.ZLBitmapImage;
import org.geometerplus.fbreader.formats.ExternalFormatPlugin;
import org.geometerplus.fbreader.formats.PluginImage;
import org.geometerplus.android.fbreader.api.FBReaderIntents;
import org.geometerplus.android.fbreader.formatPlugin.PluginUtil;
import org.geometerplus.android.fbreader.formatPlugin.CoverReader;
public class AndroidImageSynchronizer implements ZLImageProxy.Synchronizer {
@ -135,7 +134,8 @@ public class AndroidImageSynchronizer implements ZLImageProxy.Synchronizer {
connection = new Connection(plugin);
myConnections.put(plugin, connection);
myContext.bindService(
PluginUtil.createIntent(plugin, FBReaderIntents.Action.PLUGIN_CONNECT_COVER_SERVICE),
new Intent(FBReaderIntents.Action.PLUGIN_CONNECT_COVER_SERVICE)
.setPackage(plugin.packageName()),
connection,
Context.BIND_AUTO_CREATE
);

8
fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java
View file

@ -22,6 +22,7 @@ package org.geometerplus.fbreader.formats;
import org.geometerplus.zlibrary.core.util.SystemInfo;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
public class ComicBookPlugin extends ExternalFormatPlugin {
public ComicBookPlugin(SystemInfo systemInfo) {
@ -37,4 +38,11 @@ public class ComicBookPlugin extends ExternalFormatPlugin {
public void readMetainfo(AbstractBook book) {
// TODO: implement
}
@Override
public void readUids(AbstractBook book) {
if (book.uids().isEmpty()) {
book.addUid(BookUtil.createUid(book, "SHA-256"));
}
}
}

8
fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java
View file

@ -22,6 +22,7 @@ package org.geometerplus.fbreader.formats;
import org.geometerplus.zlibrary.core.util.SystemInfo;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
public class DjVuPlugin extends ExternalFormatPlugin {
public DjVuPlugin(SystemInfo systemInfo) {
@ -37,4 +38,11 @@ public class DjVuPlugin extends ExternalFormatPlugin {
public void readMetainfo(AbstractBook book) {
// TODO: implement
}
@Override
public void readUids(AbstractBook book) {
if (book.uids().isEmpty()) {
book.addUid(BookUtil.createUid(book, "SHA-256"));
}
}
}

8
fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java
View file

@ -24,7 +24,6 @@ import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.util.SystemInfo;
import org.geometerplus.fbreader.book.AbstractBook;
import org.geometerplus.fbreader.book.BookUtil;
public abstract class ExternalFormatPlugin extends FormatPlugin {
protected ExternalFormatPlugin(SystemInfo systemInfo, String fileType) {
@ -57,13 +56,6 @@ public abstract class ExternalFormatPlugin extends FormatPlugin {
return null;
}
@Override
public void readUids(AbstractBook book) {
if (book.uids().isEmpty()) {
book.addUid(BookUtil.createUid(book, "SHA-256"));
}
}
@Override
public String toString() {
return "ExternalFormatPlugin [" + supportedFileType() + "]";

7
fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java
View file

@ -58,4 +58,11 @@ public class PDFPlugin extends ExternalFormatPlugin {
e.printStackTrace();
}
}
@Override
public void readUids(AbstractBook book) {
if (book.uids().isEmpty()) {
book.addUid(BookUtil.createUid(book, "SHA-256"));
}
}
}