From b995c9dd3cbfe8ca6b47452915de4db041b06a1b Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 1 Oct 2015 00:53:29 +0100 Subject: [PATCH] sync with premium version --- .../android/fbreader/util/AndroidImageSynchronizer.java | 4 ++-- .../geometerplus/fbreader/formats/ComicBookPlugin.java | 8 ++++++++ .../org/geometerplus/fbreader/formats/DjVuPlugin.java | 8 ++++++++ .../fbreader/formats/ExternalFormatPlugin.java | 8 -------- .../java/org/geometerplus/fbreader/formats/PDFPlugin.java | 7 +++++++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java index 27dcbbd01..7e5885ac4 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/util/AndroidImageSynchronizer.java @@ -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 ); diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java index d233e8a91..7a9e80c9c 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ComicBookPlugin.java @@ -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")); + } + } } diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java index a8cfb7c03..a8f1edfad 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/DjVuPlugin.java @@ -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")); + } + } } diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java index 44d930d9d..12fd54f56 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/ExternalFormatPlugin.java @@ -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() + "]"; diff --git a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java index 9a0729664..c96faae52 100644 --- a/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java +++ b/fbreader/app/src/main/java/org/geometerplus/fbreader/formats/PDFPlugin.java @@ -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")); + } + } }