From 3824c1fa18a69800fce932ca4a0d474d207a6380 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Sat, 28 Dec 2019 20:32:51 +0100 Subject: [PATCH 1/2] wrap timber logs to only show in debug builds and source formatting --- .gitignore | 1 + r2-testapp/build.gradle | 4 +- .../main/java/org/readium/r2/testapp/R2App.kt | 5 +- .../r2/testapp/audiobook/AudiobookActivity.kt | 2 +- .../readium/r2/testapp/comic/ComicActivity.kt | 2 +- .../r2/testapp/comic/DiViNaActivity.kt | 5 +- .../r2/testapp/db/BookmarksDatabase.kt | 2 +- .../readium/r2/testapp/db/BooksDatabase.kt | 4 +- .../r2/testapp/db/HighlightsDatabase.kt | 2 +- .../readium/r2/testapp/epub/EpubActivity.kt | 3 +- .../readium/r2/testapp/epub/R2ScreenReader.kt | 19 +++---- .../readium/r2/testapp/epub/UserSettings.kt | 4 +- .../r2/testapp/library/BooksAdapter.kt | 4 +- .../r2/testapp/library/LibraryActivity.kt | 51 ++++++++++--------- .../testapp/opds/GridAutoFitLayoutManager.kt | 3 +- .../r2/testapp/opds/OPDSCatalogActivity.kt | 3 +- .../readium/r2/testapp/opds/OPDSDownloader.kt | 21 ++++---- .../r2/testapp/opds/OPDSListActivity.kt | 4 +- .../r2/testapp/outline/R2OutlineActivity.kt | 8 +-- .../r2/testapp/search/SearchInterface.kt | 7 +-- .../r2/testapp/search/SearchLocatorAdapter.kt | 4 +- .../r2/testapp/utils/ContentResolverUtil.kt | 3 +- .../r2/testapp/utils/R2DispatcherActivity.kt | 7 +-- .../r2/testapp/utils/SingleClickListener.kt | 2 +- .../res/drawable/background_action_mode.xml | 5 +- .../res/layout/item_recycle_highlight.xml | 4 +- .../src/main/res/layout/item_recycle_opds.xml | 1 - .../main/res/layout/item_recycle_outline.xml | 4 +- r2-testapp/src/main/res/layout/popup_note.xml | 6 +-- .../src/main/res/layout/view_action_mode.xml | 22 ++++---- .../res/layout/view_action_mode_reverse.xml | 22 ++++---- .../org/readium/r2/testapp/CatalogActivity.kt | 13 ++--- .../r2/testapp/DRMManagementActivity.kt | 7 +-- 33 files changed, 131 insertions(+), 123 deletions(-) diff --git a/.gitignore b/.gitignore index aa4b65b5..82d573a9 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /captures .externalNativeBuild *.aab +r2-testapp/release diff --git a/r2-testapp/build.gradle b/r2-testapp/build.gradle index c7674599..2e676744 100644 --- a/r2-testapp/build.gradle +++ b/r2-testapp/build.gradle @@ -18,7 +18,7 @@ group = 'com.github.readium' int major = 2 int minor = 1 int patch = 0 -int build = 17 +int build = 22 String type = "" def version = "$major.$minor.$patch" @@ -119,7 +119,7 @@ dependencies { implementation "androidx.recyclerview:recyclerview:1.1.0" implementation "androidx.cardview:cardview:1.0.0" implementation 'androidx.webkit:webkit:1.1.0' - implementation "com.google.android.material:material:1.2.0-alpha02" + implementation "com.google.android.material:material:1.2.0-alpha03" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation ('com.github.edrlab.nanohttpd:nanohttpd-nanolets:2.3.2') { diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/R2App.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/R2App.kt index dcbbee41..5c740656 100755 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/R2App.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/R2App.kt @@ -15,6 +15,7 @@ import android.content.ContentResolver import android.content.Context import nl.komponents.kovenant.android.startKovenant import nl.komponents.kovenant.android.stopKovenant +import org.readium.r2.testapp.BuildConfig.DEBUG import timber.log.Timber class R2App : Application() { @@ -24,9 +25,7 @@ class R2App : Application() { // Configure Kovenant with standard dispatchers // suitable for an Android environment. startKovenant() - if (BuildConfig.DEBUG) { - Timber.plant(Timber.DebugTree()) - } + if (DEBUG) Timber.plant(Timber.DebugTree()) } override fun onTerminate() { diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudiobookActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudiobookActivity.kt index b8ac0f18..fca6bf2b 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudiobookActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/audiobook/AudiobookActivity.kt @@ -154,7 +154,7 @@ class AudiobookActivity : R2AudiobookActivity(), NavigatorDelegate { override fun onDestroy() { super.onDestroy() - activitiesLaunched.getAndDecrement(); + activitiesLaunched.getAndDecrement() } override fun onStop() { diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt index b7ba7dac..4005a6fd 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt @@ -100,7 +100,7 @@ class ComicActivity : R2CbzActivity(), CoroutineScope, NavigatorDelegate { override fun onDestroy() { super.onDestroy() - activitiesLaunched.getAndDecrement(); + activitiesLaunched.getAndDecrement() } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/comic/DiViNaActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/comic/DiViNaActivity.kt index 6a7d28af..df36f2fb 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/comic/DiViNaActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/comic/DiViNaActivity.kt @@ -19,6 +19,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import org.readium.r2.navigator.divina.R2DiViNaActivity import org.readium.r2.shared.Locator +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.testapp.R import org.readium.r2.testapp.library.activitiesLaunched import org.readium.r2.testapp.outline.R2OutlineActivity @@ -76,7 +77,7 @@ class DiViNaActivity : R2DiViNaActivity(), CoroutineScope { data ?: return if (requestCode == 2 && resultCode == Activity.RESULT_OK) { val locator = data.getSerializableExtra("locator") as Locator - Timber.d("locator href ${locator.href}") + if (DEBUG) Timber.d("locator href ${locator.href}") // Call the player's goTo function with the considered href divinaWebView.evaluateJavascript("if (player) { player.goTo('${locator.href}'); };", null) @@ -85,7 +86,7 @@ class DiViNaActivity : R2DiViNaActivity(), CoroutineScope { override fun onDestroy() { super.onDestroy() - activitiesLaunched.getAndDecrement(); + activitiesLaunched.getAndDecrement() } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/db/BookmarksDatabase.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/db/BookmarksDatabase.kt index e269f9b1..e2f58efe 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/db/BookmarksDatabase.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/db/BookmarksDatabase.kt @@ -188,7 +188,7 @@ class BOOKMARKS(private var database: BookmarksDatabaseOpenHelper) { return null } - fun has(bookmark: Bookmark): List { + private fun has(bookmark: Bookmark): List { return database.use { select(BOOKMARKSTable.NAME, BOOKMARKSTable.ID, diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/db/BooksDatabase.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/db/BooksDatabase.kt index b02306ca..f0ef7591 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/db/BooksDatabase.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/db/BooksDatabase.kt @@ -53,14 +53,14 @@ class Book(var id: Long? = null, get() { val url = URI(href) if (!url.scheme.isNullOrEmpty() && url.isAbsolute) { - val uri = Uri.parse(href); + val uri = Uri.parse(href) return uri.lastPathSegment } return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val path = Paths.get(href) path.fileName.toString() } else { - val uri = Uri.parse(href); + val uri = Uri.parse(href) uri.lastPathSegment } } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/db/HighlightsDatabase.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/db/HighlightsDatabase.kt index 5e3daabd..d13a6795 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/db/HighlightsDatabase.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/db/HighlightsDatabase.kt @@ -174,7 +174,7 @@ class HIGHLIGHTS(private var database: HighlightsDatabaseOpenHelper) { return null } - fun has(highlight: Highlight): List { + private fun has(highlight: Highlight): List { return database.use { select(HIGHLIGHTSTable.NAME, diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt index 12255f48..65746b0f 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/EpubActivity.kt @@ -48,6 +48,7 @@ import org.readium.r2.navigator.epub.Style import org.readium.r2.navigator.pager.R2EpubPageFragment import org.readium.r2.navigator.pager.R2PagerAdapter import org.readium.r2.shared.* +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.testapp.DRMManagementActivity import org.readium.r2.testapp.R import org.readium.r2.testapp.db.* @@ -582,7 +583,7 @@ class EpubActivity : R2EpubActivity(), CoroutineScope, NavigatorDelegate/*, Visu currentFragment.webView.runJavaScript("markSearch('${searchStorage.getString("term", null)}', null, '$resourceHref', '$resourceType', '$resourceTitle', '$index')") { result -> - Timber.d("###### $result") + if (DEBUG) Timber.d("###### $result") } } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/R2ScreenReader.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/R2ScreenReader.kt index ca68915c..2f8f1548 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/R2ScreenReader.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/R2ScreenReader.kt @@ -20,6 +20,7 @@ import org.readium.r2.navigator.BASE_URL import org.readium.r2.navigator.IR2TTS import org.readium.r2.navigator.VisualNavigator import org.readium.r2.shared.Publication +import org.readium.r2.testapp.BuildConfig.DEBUG import timber.log.Timber import java.io.IOException import java.util.* @@ -64,7 +65,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat value < 0 -> 0 else -> value } - Timber.tag(this::class.java.simpleName).d("Current utterance index: $currentUtterance") + if (DEBUG) Timber.tag(this::class.java.simpleName).d("Current utterance index: $currentUtterance") } private var items = publication.readingOrder @@ -93,7 +94,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat textToSpeech = TextToSpeech(context, TextToSpeech.OnInitListener { status -> initialized = (status != TextToSpeech.ERROR) - Timber.tag(this::class.java.simpleName).d("textToSpeech initialization status: $initialized") + if (DEBUG) Timber.tag(this::class.java.simpleName).d("textToSpeech initialization status: $initialized") }) } @@ -278,12 +279,12 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat * @param utteranceId The utterance ID of the utterance. */ override fun onError(utteranceId: String?) { - Timber.tag(this::class.java.simpleName).e("Error saying: ${utterances[utteranceId!!.toInt()]}") + if (DEBUG) Timber.tag(this::class.java.simpleName).e("Error saying: ${utterances[utteranceId!!.toInt()]}") } }) if (res == TextToSpeech.ERROR) { - Timber.tag(this::class.java.simpleName).e("TTS failed to set callbacks") + if (DEBUG) Timber.tag(this::class.java.simpleName).e("TTS failed to set callbacks") return false } @@ -317,7 +318,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat isPaused = false if (initialized && configure()) { if (currentUtterance >= utterances.size) { - Timber.tag(this::class.java.simpleName).e("Invalid currentUtterance value: $currentUtterance . Expected less than $utterances.size") + if (DEBUG) Timber.tag(this::class.java.simpleName).e("Invalid currentUtterance value: $currentUtterance . Expected less than $utterances.size") currentUtterance = 0 } val index = currentUtterance @@ -406,7 +407,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat resumeReading() } } catch (e: Exception) { - Timber.tag(this::class.java.simpleName).e(e.toString()) + if (DEBUG) Timber.tag(this::class.java.simpleName).e(e.toString()) return false } @@ -445,7 +446,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat */ private fun addToUtterancesQueue(utterance: String, index: Int): Boolean { if (textToSpeech.speak(utterance, TextToSpeech.QUEUE_ADD, null, index.toString()) == TextToSpeech.ERROR) { - Timber.tag(this::class.java.simpleName).e("Error while adding utterance: $utterance to the TTS queue") + if (DEBUG) Timber.tag(this::class.java.simpleName).e("Error while adding utterance: $utterance to the TTS queue") return false } @@ -459,7 +460,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat */ private fun flushUtterancesQueue(): Boolean { if (textToSpeech.speak("", TextToSpeech.QUEUE_FLUSH, null, null) == TextToSpeech.ERROR) { - Timber.tag(this::class.java.simpleName).e("Error while flushing TTS queue.") + if (DEBUG) Timber.tag(this::class.java.simpleName).e("Error while flushing TTS queue.") return false } @@ -516,7 +517,7 @@ class R2ScreenReader(var context: Context, var ttsCallbacks: IR2TTS, var navigat splitParagraphAndAddToUtterances(elements) } catch (e: IOException) { - Timber.tag(this::class.java.simpleName).e(e.toString()) + if (DEBUG) Timber.tag(this::class.java.simpleName).e(e.toString()) success = false return@Runnable } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt index b0dd737e..29dcfafc 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/epub/UserSettings.kt @@ -30,7 +30,7 @@ import org.readium.r2.testapp.R import org.readium.r2.testapp.utils.color import java.io.File -class UserSettings(var preferences: SharedPreferences, val context: Context, val UIPreset: MutableMap) { +class UserSettings(var preferences: SharedPreferences, val context: Context, private val UIPreset: MutableMap) { lateinit var resourcePager: R2ViewPager @@ -341,7 +341,7 @@ class UserSettings(var preferences: SharedPreferences, val context: Context, val // Publisher defaults val publisherDefaultSwitch = layout.findViewById(R.id.publisher_default) as Switch - publisherDefaultSwitch.contentDescription = "\u00A0"; + publisherDefaultSwitch.contentDescription = "\u00A0" publisherDefaultSwitch.isChecked = publisherDefault.on publisherDefaultSwitch.setOnCheckedChangeListener { _, b -> diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/library/BooksAdapter.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/library/BooksAdapter.kt index 93e1fc99..9497b117 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/library/BooksAdapter.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/library/BooksAdapter.kt @@ -23,7 +23,7 @@ import org.readium.r2.testapp.utils.singleClick import java.io.ByteArrayInputStream -open class BooksAdapter(private val activity: Activity, private var books: MutableList, private val server: String, private var itemListener: RecyclerViewClickListener) : RecyclerView.Adapter() { +open class BooksAdapter(private val activity: Activity, private var books: MutableList, private var itemListener: RecyclerViewClickListener) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val inflater = activity.layoutInflater @@ -37,7 +37,7 @@ open class BooksAdapter(private val activity: Activity, private var books: Mutab val book = books[position] viewHolder.textView.text = book.title - viewHolder.textView.contentDescription = "\u00A0"; + viewHolder.textView.contentDescription = "\u00A0" viewHolder.imageView.setImageResource(R.drawable.cover) diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/library/LibraryActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/library/LibraryActivity.kt index fb3b8bbe..2f17598a 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/library/LibraryActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/library/LibraryActivity.kt @@ -71,6 +71,7 @@ import org.readium.r2.streamer.parser.epub.EPUBConstant import org.readium.r2.streamer.parser.epub.EpubParser import org.readium.r2.streamer.server.BASE_URL import org.readium.r2.streamer.server.Server +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.testapp.R import org.readium.r2.testapp.R2AboutActivity import org.readium.r2.testapp.audiobook.AudiobookActivity @@ -103,7 +104,7 @@ import java.util.concurrent.atomic.AtomicInteger import java.util.zip.ZipException import kotlin.coroutines.CoroutineContext -var activitiesLaunched: AtomicInteger = AtomicInteger(0); +var activitiesLaunched: AtomicInteger = AtomicInteger(0) @SuppressLint("Registered") open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClickListener, LCPLibraryActivityService, CoroutineScope { @@ -146,9 +147,9 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick localPort = s.localPort server = Server(localPort) - val properties = Properties(); - val inputStream = this.assets.open("configs/config.properties"); - properties.load(inputStream); + val properties = Properties() + val inputStream = this.assets.open("configs/config.properties") + properties.load(inputStream) val useExternalFileDir = properties.getProperty("useExternalFileDir", "false")!!.toBoolean() R2DIRECTORY = if (useExternalFileDir) { @@ -166,7 +167,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick positionsDB = PositionsDatabase(this) - booksAdapter = BooksAdapter(this, books, "$BASE_URL:$localPort", this) + booksAdapter = BooksAdapter(this, books, this) parseIntent(null) @@ -294,7 +295,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick editTextHref!!.requestFocus() } else { editTextHref!!.text.toString().let { - val extension = when (it.substring(it.lastIndexOf("."))){ + val extension = when (it.substring(it.lastIndexOf("."))) { Publication.EXTENSION.EPUB.value -> Publication.EXTENSION.EPUB Publication.EXTENSION.JSON.value -> Publication.EXTENSION.JSON Publication.EXTENSION.AUDIO.value -> Publication.EXTENSION.AUDIO @@ -347,7 +348,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick }.show() } - fun downloadData(parseData: ParseData) { + private fun downloadData(parseData: ParseData) { val progress = indeterminateProgressDialog(getString(R.string.progress_wait_while_downloading_book)) progress.show() @@ -432,9 +433,9 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick duplicateAlert.dismiss() booksAdapter.notifyDataSetChanged() catalogView.longSnackbar("publication added to your library") - if (!lcp) { - //prepareSyntheticPageList(publication, book) - } +// if (!lcp) { + //prepareSyntheticPageList(publication, book) +// } } } val cancelButton = getButton(AlertDialog.BUTTON_NEGATIVE) @@ -469,7 +470,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick startActivityForResult(intent, 1) } - fun parseURL(url: URL): Promise { + private fun parseURL(url: URL): Promise { return Fuel.get(url.toString(), null).promise() then { val (_, _, result) = it if (isJson(result)) { @@ -694,7 +695,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick server.start() } catch (e: IOException) { // do nothing - Timber.e(e) + if (DEBUG) Timber.e(e) } if (server.isAlive) { @@ -747,10 +748,10 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick when { element.endsWith(Publication.EXTENSION.DIVINA.value) -> { - val output = File(publicationPath); + val output = File(publicationPath) if (!output.exists()) { if (!output.mkdir()) { - throw RuntimeException("Cannot create directory"); + throw RuntimeException("Cannot create directory") } } ZipUtil.unpack(input, output) @@ -817,8 +818,8 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick launch { val publicationIdentifier = publication.metadata.identifier!! - val book: Book = when { - publication.type == Publication.TYPE.EPUB -> { + val book: Book = when (publication.type) { + Publication.TYPE.EPUB -> { preferences.edit().putString("$publicationIdentifier-publicationPort", localPort.toString()).apply() val author = authorName(publication) val cover = publication.coverLink?.href?.let { @@ -834,7 +835,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick } Book(title = publication.metadata.title, author = author, href = absolutePath, identifier = publicationIdentifier, cover = cover, ext = Publication.EXTENSION.EPUB, progression = "{}") } - publication.type == Publication.TYPE.CBZ -> { + Publication.TYPE.CBZ -> { val cover = publication.coverLink?.href?.let { try { container.data(it) @@ -845,7 +846,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick Book(title = publication.metadata.title, href = absolutePath, identifier = publicationIdentifier, cover = cover, ext = Publication.EXTENSION.CBZ, progression = "{}") } - publication.type == Publication.TYPE.DiViNa -> { + Publication.TYPE.DiViNa -> { val cover = publication.coverLink?.href?.let { try { container.data(it) @@ -856,7 +857,7 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick Book(title = publication.metadata.title, href = absolutePath, identifier = publicationIdentifier, cover = cover, ext = Publication.EXTENSION.DIVINA, progression = "{}") } - publication.type == Publication.TYPE.AUDIO -> { + Publication.TYPE.AUDIO -> { val cover = publication.coverLink?.href?.let { try { container.data(it) @@ -1040,10 +1041,10 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick private fun startActivity(publicationPath: String, book: Book, publication: Publication, coverByteArray: ByteArray? = null) { - val intent = Intent(this, when { - publication.type == Publication.TYPE.AUDIO -> AudiobookActivity::class.java - publication.type == Publication.TYPE.CBZ -> ComicActivity::class.java - publication.type == Publication.TYPE.DiViNa -> DiViNaActivity::class.java + val intent = Intent(this, when (publication.type) { + Publication.TYPE.AUDIO -> AudiobookActivity::class.java + Publication.TYPE.CBZ -> ComicActivity::class.java + Publication.TYPE.DiViNa -> DiViNaActivity::class.java else -> EpubActivity::class.java }) intent.putExtra("publicationPath", publicationPath) @@ -1116,10 +1117,10 @@ open class LibraryActivity : AppCompatActivity(), BooksAdapter.RecyclerViewClick when { name.endsWith(Publication.EXTENSION.DIVINA.value) -> { - val output = File(publicationPath); + val output = File(publicationPath) if (!output.exists()) { if (!output.mkdir()) { - throw RuntimeException("Cannot create directory"); + throw RuntimeException("Cannot create directory") } } ZipUtil.unpack(input, output) diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/GridAutoFitLayoutManager.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/GridAutoFitLayoutManager.kt index b896cf4d..bba0711c 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/GridAutoFitLayoutManager.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/GridAutoFitLayoutManager.kt @@ -15,6 +15,7 @@ import android.util.TypedValue import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import kotlin.math.max class GridAutoFitLayoutManager : GridLayoutManager { private var mColumnWidth: Int = 0 @@ -64,7 +65,7 @@ class GridAutoFitLayoutManager : GridLayoutManager { } else { height - paddingTop - paddingBottom } - val spanCount = Math.max(1, totalSpace / mColumnWidth) + val spanCount = max(1, totalSpace / mColumnWidth) setSpanCount(spanCount) mColumnWidthChanged = false mWidthChanged = false diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSCatalogActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSCatalogActivity.kt index e4461455..47eed984 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSCatalogActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSCatalogActivity.kt @@ -41,6 +41,7 @@ import org.readium.r2.opds.OPDS2Parser import org.readium.r2.shared.Link import org.readium.r2.shared.opds.Facet import org.readium.r2.shared.opds.ParseData +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.testapp.R import timber.log.Timber import java.net.MalformedURLException @@ -172,7 +173,7 @@ class OPDSCatalogActivity : AppCompatActivity(), CoroutineScope { progress.dismiss() // snackbar(act.coordinatorLayout(), it.message!!) } - Timber.e(it) + if (DEBUG) Timber.e(it) } } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt index 1253ed15..1a3edd19 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDownloader.kt @@ -15,6 +15,7 @@ import com.github.kittinunf.fuel.Fuel import nl.komponents.kovenant.Promise import nl.komponents.kovenant.then import org.readium.r2.shared.promise +import org.readium.r2.testapp.BuildConfig.DEBUG import timber.log.Timber import java.io.File import java.net.URL @@ -31,23 +32,23 @@ class OPDSDownloader(context: Context) { } private fun useExternalDir(context: Context): Boolean { - val properties = Properties(); - val inputStream = context.assets.open("configs/config.properties"); - properties.load(inputStream); + val properties = Properties() + val inputStream = context.assets.open("configs/config.properties") + properties.load(inputStream) return properties.getProperty("useExternalFileDir", "false")!!.toBoolean() } fun publicationUrl(url: String, parameters: List>? = null): Promise, Exception> { val fileName = UUID.randomUUID().toString() - Timber.i("download url %s", url) + if (DEBUG) Timber.i("download url %s", url) return Fuel.download(url).destination { _, request_url -> - Timber.i("request url %s", request_url.toString()) - Timber.i("download destination %s %s %s", "%s%s", rootDir, fileName) + if (DEBUG) Timber.i("request url %s", request_url.toString()) + if (DEBUG) Timber.i("download destination %s %s %s", "%s%s", rootDir, fileName) File(rootDir, fileName) }.promise() then { val (_, response, _) = it - Timber.i("response url %s", response.url.toString()) + if (DEBUG) Timber.i("response url %s", response.url.toString()) if (url == response.url.toString()) { Pair(rootDir + fileName, fileName) } else { @@ -58,12 +59,12 @@ class OPDSDownloader(context: Context) { private fun redirectedDownload(responseUrl: URL, fileName: String): Promise, Exception> { return Fuel.download(responseUrl.toString()).destination { _, request_url -> - Timber.i("request url %s", request_url.toString()) - Timber.i("download destination %s %s %s", "%s%s", rootDir, fileName) + if (DEBUG) Timber.i("request url %s", request_url.toString()) + if (DEBUG) Timber.i("download destination %s %s %s", "%s%s", rootDir, fileName) File(rootDir, fileName) }.promise() then { val (_, response, _) = it - Timber.i("response url %s", response.url.toString()) + if (DEBUG) Timber.i("response url %s", response.url.toString()) Pair(rootDir + fileName, fileName) } } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSListActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSListActivity.kt index 5b3c982c..de4afd57 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSListActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSListActivity.kt @@ -188,7 +188,7 @@ class OPDSListActivity : AppCompatActivity() { } } -private class OPDSViewAdapter(private val activity: Activity, private val list: MutableList) : androidx.recyclerview.widget.RecyclerView.Adapter() { +private class OPDSViewAdapter(private val activity: Activity, private val list: MutableList) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val inflater = activity.layoutInflater @@ -221,7 +221,7 @@ private class OPDSViewAdapter(private val activity: Activity, private val list: return list.size } - internal inner class ViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) { + internal inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val button: Button = view.findViewById(R.id.button) as Button } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt index 2aa2ac2b..c737fff6 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt @@ -262,13 +262,13 @@ class R2OutlineActivity : AppCompatActivity() { tabLandmarks.setContent(R.id.landmarks_tab) - when { - publication.type == Publication.TYPE.AUDIO -> { + when (publication.type) { + Publication.TYPE.AUDIO -> { tabHost.addTab(tabTOC) tabHost.addTab(tabBookmarks) } - publication.type == Publication.TYPE.DiViNa -> tabHost.addTab(tabTOC) - publication.type == Publication.TYPE.CBZ -> tabHost.addTab(tabTOC) + Publication.TYPE.DiViNa -> tabHost.addTab(tabTOC) + Publication.TYPE.CBZ -> tabHost.addTab(tabTOC) else -> { tabHost.addTab(tabTOC) tabHost.addTab(tabBookmarks) diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchInterface.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchInterface.kt index b171b84d..a3626885 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchInterface.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchInterface.kt @@ -7,6 +7,7 @@ import org.readium.r2.navigator.pager.R2EpubPageFragment import org.readium.r2.navigator.pager.R2PagerAdapter import org.readium.r2.shared.Locations import org.readium.r2.shared.LocatorText +import org.readium.r2.testapp.BuildConfig.DEBUG import timber.log.Timber @@ -20,7 +21,7 @@ interface SearchInterface { /** * This is our custom Search Module, this class uses MarkJS library and implements SearchInterface */ -class MarkJSSearchEngine(var listener: IR2Activity) : SearchInterface { +class MarkJSSearchEngine(private var listener: IR2Activity) : SearchInterface { override fun search(keyword: String, callback: (Pair>) -> Unit) { @@ -34,7 +35,7 @@ class MarkJSSearchEngine(var listener: IR2Activity) : SearchInterface { val resourceTitle = resource.title ?: "" Handler().postDelayed({ fragment.webView.runJavaScript("markSearch('${keyword}', null, '$resourceHref', '$resourceType', '$resourceTitle')") { result -> - Timber.tag("SEARCH").d("result $result") + if (DEBUG) Timber.tag("SEARCH").d("result $result") if (result != "null") { val locatorsList = mutableListOf() @@ -55,7 +56,7 @@ class MarkJSSearchEngine(var listener: IR2Activity) : SearchInterface { } } - Timber.tag("SEARCH").d("resourceIndex $resourceIndex publication.readingOrder.size ${listener.publication.readingOrder.size}") + if (DEBUG) Timber.tag("SEARCH").d("resourceIndex $resourceIndex publication.readingOrder.size ${listener.publication.readingOrder.size}") if (resourceIndex == (listener.publication.readingOrder.size - 1)) { callback(Pair(true, searchResult)) } else { diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchLocatorAdapter.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchLocatorAdapter.kt index 745489ab..5cc7e0ca 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchLocatorAdapter.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/search/SearchLocatorAdapter.kt @@ -30,7 +30,7 @@ class SearchLocator(href: String, /** * This class is an adapter for Search results' list view */ -class SearchLocatorAdapter(private val activity: Activity, var results: List, private var itemListener: RecyclerViewClickListener) : RecyclerView.Adapter() { +class SearchLocatorAdapter(private val activity: Activity, private var results: List, private var itemListener: RecyclerViewClickListener) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { val inflater = activity.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater @@ -47,7 +47,7 @@ class SearchLocatorAdapter(private val activity: Activity, var results: List$highlight$txtAfter")) + viewHolder.textView.text = Html.fromHtml("$txtBefore$highlight$txtAfter") viewHolder.itemView.singleClick { v-> itemListener.recyclerViewListClicked(v, position) diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt index df2d1715..8e8ebcb7 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/ContentResolverUtil.kt @@ -17,6 +17,7 @@ import android.os.Environment import android.provider.DocumentsContract import android.provider.MediaStore import android.text.TextUtils +import org.readium.r2.testapp.BuildConfig.DEBUG import org.zeroturnaround.zip.commons.IOUtils import timber.log.Timber import java.io.* @@ -49,7 +50,7 @@ object ContentResolverUtil { out = FileOutputStream(dst) IOUtils.copy(`in`, out) } catch (ioe: IOException) { - Timber.e(ioe) + if (DEBUG) Timber.e(ioe) } finally { IOUtils.closeQuietly(out) IOUtils.closeQuietly(`in`) diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt index 1f949a9e..87693448 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/R2DispatcherActivity.kt @@ -12,8 +12,7 @@ package org.readium.r2.testapp.utils import android.app.Activity import android.os.Bundle -import org.readium.r2.testapp.BuildConfig - +import org.readium.r2.testapp.BuildConfig.DEBUG import timber.log.Timber /** @@ -29,9 +28,7 @@ class R2DispatcherActivity : Activity() { try { mMapper.dispatchIntent(intent) } catch (iae: IllegalArgumentException) { - if (BuildConfig.DEBUG) { - Timber.e(iae, "Deep links - Invalid URI") - } + if (DEBUG) Timber.e(iae, "Deep links - Invalid URI") } finally { finish() } diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SingleClickListener.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SingleClickListener.kt index fd0d5129..1017d194 100644 --- a/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SingleClickListener.kt +++ b/r2-testapp/src/main/java/org/readium/r2/testapp/utils/SingleClickListener.kt @@ -27,6 +27,6 @@ class SingleClickListener(private val click: (v: View) -> Unit) : View.OnClickLi } } -fun View.singleClick(l: (android.view.View) -> Unit) { +fun View.singleClick(l: (View) -> Unit) { setOnClickListener(SingleClickListener(l)) } diff --git a/r2-testapp/src/main/res/drawable/background_action_mode.xml b/r2-testapp/src/main/res/drawable/background_action_mode.xml index 9cfefe37..bab1a0d3 100644 --- a/r2-testapp/src/main/res/drawable/background_action_mode.xml +++ b/r2-testapp/src/main/res/drawable/background_action_mode.xml @@ -1,7 +1,6 @@ - - + + \ No newline at end of file diff --git a/r2-testapp/src/main/res/layout/item_recycle_highlight.xml b/r2-testapp/src/main/res/layout/item_recycle_highlight.xml index 203402c2..3fa96625 100644 --- a/r2-testapp/src/main/res/layout/item_recycle_highlight.xml +++ b/r2-testapp/src/main/res/layout/item_recycle_highlight.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="20dp" android:layout_marginTop="4dp" - android:textSize="11sp" + android:textSize="12sp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent"/> @@ -60,7 +60,7 @@ android:layout_marginTop="4dp" android:maxLines="2" android:textSize="16sp" - app:layout_constraintEnd_toStartOf="@+id/overflow" + app:layout_constraintEnd_toStartOf="@+id/highlight_overflow" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/highlight_text" /> diff --git a/r2-testapp/src/main/res/layout/item_recycle_opds.xml b/r2-testapp/src/main/res/layout/item_recycle_opds.xml index 2028f554..2facbe97 100644 --- a/r2-testapp/src/main/res/layout/item_recycle_opds.xml +++ b/r2-testapp/src/main/res/layout/item_recycle_opds.xml @@ -10,7 +10,6 @@ + android:contentDescription="TODO" + tools:ignore="Suspicious0dp" /> + android:layout_marginStart="16dp" + android:layout_marginEnd="10dp"/> @@ -46,7 +46,7 @@ android:id="@+id/blue" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_blue"/> @@ -54,7 +54,7 @@ android:id="@+id/red" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_red"/> @@ -62,7 +62,7 @@ android:id="@+id/purple" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_purple"/> @@ -72,7 +72,7 @@ android:layout_width="0.5dp" android:layout_height="match_parent" android:background="#b9b9b9" - android:layout_marginLeft="4dp"/> + android:layout_marginStart="4dp"/> @@ -96,8 +96,8 @@ android:layout_height="20dp" android:layout_marginTop="8dp" android:layout_marginBottom="8.6dp" - android:layout_marginLeft="12.5dp" - android:layout_marginRight="13dp" + android:layout_marginStart="12.5dp" + android:layout_marginEnd="13dp" android:src="@drawable/ic_delete" android:scaleType="fitXY"/> diff --git a/r2-testapp/src/main/res/layout/view_action_mode_reverse.xml b/r2-testapp/src/main/res/layout/view_action_mode_reverse.xml index 6ac19533..efe44ce2 100644 --- a/r2-testapp/src/main/res/layout/view_action_mode_reverse.xml +++ b/r2-testapp/src/main/res/layout/view_action_mode_reverse.xml @@ -20,8 +20,8 @@ android:id="@+id/yellow" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginLeft="14dp" - android:layout_marginRight="10dp" + android:layout_marginStart="14dp" + android:layout_marginEnd="10dp" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" android:button="@android:color/transparent" @@ -31,7 +31,7 @@ android:id="@+id/green" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_green"/> @@ -39,7 +39,7 @@ android:id="@+id/blue" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_blue"/> @@ -47,7 +47,7 @@ android:id="@+id/red" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_red"/> @@ -55,7 +55,7 @@ android:id="@+id/purple" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:button="@android:color/transparent" android:background="@drawable/selector_purple"/> @@ -65,7 +65,7 @@ android:layout_width="0.5dp" android:layout_height="match_parent" android:background="#b9b9b9" - android:layout_marginLeft="4dp"/> + android:layout_marginStart="4dp"/> @@ -89,8 +89,8 @@ android:layout_height="20dp" android:layout_marginTop="8dp" android:layout_marginBottom="8.6dp" - android:layout_marginLeft="12.5dp" - android:layout_marginRight="13dp" + android:layout_marginStart="12.5dp" + android:layout_marginEnd="13dp" android:src="@drawable/ic_delete" android:scaleType="fitXY"/> diff --git a/r2-testapp/src/withlcp/java/org/readium/r2/testapp/CatalogActivity.kt b/r2-testapp/src/withlcp/java/org/readium/r2/testapp/CatalogActivity.kt index 4a39dc04..84055d3a 100644 --- a/r2-testapp/src/withlcp/java/org/readium/r2/testapp/CatalogActivity.kt +++ b/r2-testapp/src/withlcp/java/org/readium/r2/testapp/CatalogActivity.kt @@ -31,6 +31,7 @@ import kotlinx.coroutines.launch import org.jetbrains.anko.* import org.jetbrains.anko.appcompat.v7.Appcompat import org.jetbrains.anko.design.longSnackbar +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.lcp.public.* import org.readium.r2.shared.Injectable import org.readium.r2.shared.Publication @@ -57,7 +58,7 @@ class CatalogActivity : LibraryActivity(), LCPLibraryActivityService, CoroutineS override val coroutineContext: CoroutineContext get() = Dispatchers.Main - lateinit var lcpService: LCPService + private lateinit var lcpService: LCPService private var currenProgressDialog: ProgressDialog? = null @@ -67,7 +68,7 @@ class CatalogActivity : LibraryActivity(), LCPLibraryActivityService, CoroutineS listener = this } - internal var authenticationCallbacks: MutableMap Unit> = mutableMapOf() + private var authenticationCallbacks: MutableMap Unit> = mutableMapOf() override val brand: DRM.Brand get() = DRM.Brand.lcp @@ -289,8 +290,8 @@ class CatalogActivity : LibraryActivity(), LCPLibraryActivityService, CoroutineS result?.let { val publication = result as DRMFulfilledPublication - Timber.d(publication.localURL) - Timber.d(publication.suggestedFilename) + if (DEBUG) Timber.d(publication.localURL) + if (DEBUG) Timber.d(publication.suggestedFilename) val file = File(publication.localURL) launch { val parser = EpubParser() @@ -351,8 +352,8 @@ class CatalogActivity : LibraryActivity(), LCPLibraryActivityService, CoroutineS result?.let { val publication = result as DRMFulfilledPublication - Timber.d(result.localURL) - Timber.d(result.suggestedFilename) + if (DEBUG) Timber.d(result.localURL) + if (DEBUG) Timber.d(result.suggestedFilename) val file = File(result.localURL) launch { val parser = EpubParser() diff --git a/r2-testapp/src/withlcp/java/org/readium/r2/testapp/DRMManagementActivity.kt b/r2-testapp/src/withlcp/java/org/readium/r2/testapp/DRMManagementActivity.kt index f81fce51..889ec7ff 100644 --- a/r2-testapp/src/withlcp/java/org/readium/r2/testapp/DRMManagementActivity.kt +++ b/r2-testapp/src/withlcp/java/org/readium/r2/testapp/DRMManagementActivity.kt @@ -41,6 +41,7 @@ import org.readium.r2.lcp.public.LCPLicense import org.readium.r2.lcp.public.LCPService import org.readium.r2.lcp.public.R2MakeLCPService import org.readium.r2.shared.drm.DRM +import org.readium.r2.testapp.BuildConfig.DEBUG import org.readium.r2.testapp.utils.color import timber.log.Timber import kotlin.coroutines.CoroutineContext @@ -70,11 +71,11 @@ class DRMManagementActivity : AppCompatActivity(), CoroutineScope { license?.let { drm.license = license drmModel = DRMViewModel.make(drm, this) - Timber.e(error) - Timber.d(license.toString()) + if (DEBUG) Timber.e(error) + if (DEBUG) Timber.d(license.toString()) } ?: run { error?.let { - Timber.e(error) + if (DEBUG) Timber.e(error) } } } From 61e87479ea22e91adeb0a22d0bbe6d476ca7e2b9 Mon Sep 17 00:00:00 2001 From: Aferdita Muriqi Date: Sat, 28 Dec 2019 20:47:32 +0100 Subject: [PATCH 2/2] dependency update --- r2-testapp/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/r2-testapp/build.gradle b/r2-testapp/build.gradle index 2e676744..ea476087 100644 --- a/r2-testapp/build.gradle +++ b/r2-testapp/build.gradle @@ -86,22 +86,22 @@ dependencies { if (findProject(':r2-shared')) { implementation project(':r2-shared') } else { - implementation "com.github.readium:r2-shared-kotlin:1.1.4" + implementation "com.github.readium:r2-shared-kotlin:1.1.5" } if (findProject(':r2-navigator')) { implementation project(':r2-navigator') } else { - implementation "com.github.readium:r2-navigator-kotlin:1.1.3" + implementation "com.github.readium:r2-navigator-kotlin:1.1.4" } if (findProject(':r2-streamer')) { implementation project(':r2-streamer') } else { - implementation "com.github.readium:r2-streamer-kotlin:1.1.3" + implementation "com.github.readium:r2-streamer-kotlin:1.1.4" } if (findProject(':r2-opds')) { implementation project(':r2-opds') } else { - implementation "com.github.readium:r2-opds-kotlin:1.1.2" + implementation "com.github.readium:r2-opds-kotlin:1.1.3" } if (findProject(':r2-lcp')) { implementation project(':r2-lcp')