Merge pull request #58 from readium/develop

1.1.3

Author: aferditamuriqi

readium/lcp/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @aferditamuriqi

readium/lcp/.gitignore

@@ -1,3 +1,4 @@
+*.iml
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries

readium/lcp/build.gradle

@@ -1,15 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
-    ext.r2branch = 'develop'
+    ext.kotlin_version = '1.3.61'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong

readium/lcp/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

readium/lcp/r2-lcp/build.gradle

@@ -14,40 +14,24 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.readium'
 
 android {
-    flavorDimensions "testapp"
 
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
-
+        targetSdkVersion 29
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
+    }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
-        intTestapp {
-            dimension "testapp"
-        }
-        intTestappWithLcp {
-            dimension "testapp"
-        }
-        devTestapp {
-            dimension "testapp"
-        }
-        devTestappWithLcp {
-            dimension "testapp"
-        }
-    }
-
-    // default build flavour
-    defaultPublishConfig "intTestappDebug"
 }
 
 dependencies {
@@ -58,10 +42,10 @@ dependencies {
     if (findProject(':r2-shared')) {
         implementation project(':r2-shared')
     } else {
-        implementation "com.github.readium:r2-shared-kotlin:1.0.10"
+        implementation "com.github.readium:r2-shared-kotlin:1.1.6"
     }
 
-    implementation project(':liblcp')
+    implementation "readium:liblcp:1.0.0@aar"
 
     implementation('com.mcxiaoke.koi:core:0.5.5') {
         exclude module: 'support-v4'
@@ -84,7 +68,7 @@ dependencies {
     implementation 'nl.komponents.kovenant:kovenant-jvm:3.3.0'
     implementation 'nl.komponents.kovenant:kovenant-functional:3.3.0'
 
-    implementation 'org.zeroturnaround:zt-zip:1.12'
+    implementation 'org.zeroturnaround:zt-zip:1.13'
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'

readium/lcp/r2-lcp/r2-lcp.iml

@@ -16,6 +16,7 @@ import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.then
 import org.joda.time.DateTime
 import org.readium.lcp.sdk.Lcp
+import org.readium.r2.lcp.BuildConfig.DEBUG
 import org.readium.r2.lcp.license.model.LicenseDocument
 import org.readium.r2.lcp.license.model.StatusDocument
 import org.readium.r2.lcp.public.*
@@ -56,7 +57,7 @@ class License(private var documents: ValidatedDocuments,
                     return charactersLeft
                 }
             } catch (error: Error) {
-                Timber.e(error)
+                if (DEBUG) Timber.e(error)
             }
             return null
         }
@@ -77,7 +78,7 @@ class License(private var documents: ValidatedDocuments,
             charactersLeft = maxOf(0, charactersLeft - result.length)
             licenses.setCopiesLeft(charactersLeft, license.id)
         } catch (error: Error) {
-            Timber.e(error)
+            if (DEBUG) Timber.e(error)
         }
         return result
     }
@@ -90,7 +91,7 @@ class License(private var documents: ValidatedDocuments,
                     return pagesLeft
                 }
             } catch (error: Error) {
-                Timber.e(error)
+                if (DEBUG) Timber.e(error)
             }
             return null
         }
@@ -106,7 +107,7 @@ class License(private var documents: ValidatedDocuments,
             pagesLeft = maxOf(0, pagesLeft - pagesCount)
             licenses.setPrintsLeft(pagesLeft, license.id)
         } catch (error: Error) {
-            Timber.e(error)
+            if (DEBUG) Timber.e(error)
         }
         return true
     }
@@ -161,7 +162,6 @@ class License(private var documents: ValidatedDocuments,
             if (link.type == "text/html") {
                 callHTML(url, params) {
                     validateStatusDocument(it)
-
                 }
             } else {
                 callPUT(url, params) {
@@ -171,7 +171,7 @@ class License(private var documents: ValidatedDocuments,
         } catch (e: LCPError) {
             completion(LCPError.wrap(e))
         }
-
+        completion(null)
     }
 
     override val canReturnPublication: Boolean
@@ -197,6 +197,7 @@ class License(private var documents: ValidatedDocuments,
             }
             completion(null)
         }
+        completion(null)
     }
 
     init {
@@ -209,7 +210,7 @@ class License(private var documents: ValidatedDocuments,
 
     fun moveLicense(archivePath: String, licenseData: ByteArray) {
         val pathInZip = "META-INF/license.lcpl"
-        Timber.i("LCP moveLicense")
+        if (DEBUG) Timber.i("LCP moveLicense")
         val source = File(archivePath)
         val tmpZip = File("$archivePath.tmp")
         tmpZip.delete()
@@ -227,16 +228,26 @@ class License(private var documents: ValidatedDocuments,
         val title = license.link(LicenseDocument.Rel.publication)?.title
         val url = license.url(LicenseDocument.Rel.publication)
 
-        val rootDir: String = context.getExternalFilesDir(null)?.path + "/"
+        val properties =  Properties()
+        val inputStream = context.assets.open("configs/config.properties")
+        properties.load(inputStream)
+        val useExternalFileDir = properties.getProperty("useExternalFileDir", "false")!!.toBoolean()
+
+        val rootDir: String =  if (useExternalFileDir) {
+            context.getExternalFilesDir(null)?.path + "/"
+        } else {
+            context.filesDir.path + "/"
+        }
+
         val fileName = UUID.randomUUID().toString()
         return Fuel.download(url.toString()).destination { _, _ ->
-            Timber.i("LCP destination %s%s", rootDir, fileName)
+            if (DEBUG) Timber.i("LCP destination %s%s", rootDir, fileName)
             File(rootDir, fileName)
 
         }.promise() then {
             val (_, response, _) = it
-            Timber.i("LCP destination %s%s", rootDir, fileName)
-            Timber.i("LCP then  %s", response.url.toString())
+            if (DEBUG) Timber.i("LCP destination %s%s", rootDir, fileName)
+            if (DEBUG) Timber.i("LCP then  %s", response.url.toString())
 
             rootDir + fileName