Merge pull request #102 from shockbytes/backup-bugfixes

Fix bugs while backing up books

README.md

@@ -59,17 +59,37 @@ The backlog is currently empty.
 
 ## Current development
 
-### Version 3.16
-- [ ] Send csv export via Mail
+### Version 3.17
 - [ ] Move actions into Book item (https://github.com/florent37/ExpansionPanel)
 - [ ] Add Onboarding + optional Login
+- [ ] Backup file improvements
+    - [ ] Show path to local backup files
+    - [ ] Open file with FileProvider
 - [ ] Experimental remote storage Firestore implementation (for test account)
 - [ ] Fix bug with local book covers
     - [ ] In MultiBareBoneBookView (not showing up)
     - [ ] In the label overview (too big)
 
 ## Changelog
 
+### Version 3.16 - BRING BACK BACKUP
+* Google Drive REST Backup
+  * Add DriveRestClient
+  * Remove DriveApiClient + dependencies
+  * Move dependencies in `BookStorageModule`
+  * Polish Overwrite/Merge UI
+  * Replace Google Drive icon
+* Foundation for exporting local backups via Mail/other services
+  * Open local backups via intent chooser
+  * Allow external backup import in Import tab
+  * Change export/import icon
+  * Track open backup event (with provider)
+* Replace ActionBar in BookManagement screen
+* Backup issues
+  * Fix Backup Proguard rules
+  * Make last backup time reactive
+  * Fix issues with CSV files on emulators
+
 ### Version 3.15
 * Statistics pages/books over time / month + Goal per month
     * Fix issue where MarkerView draws out of ChartView bounds
@@ -124,7 +144,7 @@ The backlog is currently empty.
 
 ### Version 3.6 - GET EXCITED
 * Move to Android App Bundles
-* Improve Backups 
+* Improve Backups
 * Open source Dante
 
 ### Version 3.5 - ADD ANDROID FRAMEWORK AWESOMENESS
@@ -194,9 +214,9 @@ The backlog is currently empty.
 * Search feature
 
 ### Version 2.6 - DETAILED DESIGN
-* Rate books 
+* Rate books
 * 100% Kotlin Port if possible
-* Enter book page count manually 
+* Enter book page count manually
 * Adding notes to books
 
 ### Version 2.5 - REFACTOR RAMPAGE
@@ -209,6 +229,6 @@ The backlog is currently empty.
 * Add Crashlytics
 * Code cleanup and Kotlin Port
 * Introduction / Showcase View
-* DownloadBook / QueryCapture Activity merging 
+* DownloadBook / QueryCapture Activity merging
 * ViewPagerAdapter
 * Adaptive Icons

app/build.gradle

@@ -6,14 +6,14 @@ apply plugin: 'com.google.firebase.crashlytics'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '29.0.3'
+    buildToolsVersion '30.0.0'
 
     defaultConfig {
         applicationId "at.shockbytes.dante"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 37
-        versionName "3.15"
+        versionCode 38
+        versionName "3.16"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -56,6 +56,14 @@ android {
     }
     packagingOptions {
         exclude 'META-INF/util_release.kotlin_module'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/ASL2.0'
     }
     kotlinOptions {
         jvmTarget = "1.8"
@@ -82,22 +90,32 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
 
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.core:core-ktx:1.3.2'
 
     implementation "androidx.lifecycle:lifecycle-extensions:$archXVersion"
     implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$archXVersion"
     implementation "androidx.lifecycle:lifecycle-common-java8:$archXVersion"
     implementation "com.google.android.gms:play-services-vision:$playServicesVersionVision"
-    implementation "com.google.android.gms:play-services-drive:$playServicesVersionDrive"
     implementation "com.google.android.gms:play-services-auth:$playServicesVersionAuth"
     implementation "com.google.firebase:firebase-crashlytics:$firebaseCrashlyticsVersion"
     implementation "com.google.firebase:firebase-core:$firebaseVersionCore"
     implementation "com.google.firebase:firebase-config:$firebaseVersionConfig"
     implementation "com.google.firebase:firebase-auth:$firebaseVersionAuth"
     implementation "com.google.firebase:firebase-ml-vision:$firebaseMLVision"
 
+
+    implementation ('com.google.http-client:google-http-client-gson:1.36.0') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+    implementation('com.google.api-client:google-api-client-android:1.30.11') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+    implementation('com.google.apis:google-api-services-drive:v3-rev197-1.25.0') {
+        exclude group: 'org.apache.httpcomponents'
+    }
+
     implementation "com.google.dagger:dagger:$daggerVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
 
@@ -116,11 +134,11 @@ dependencies {
     implementation 'uk.co.samuelwall:material-tap-target-prompt:2.14.0'
 
     // Test libraries
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'androidx.test:core:1.3.0'
     testImplementation 'org.mockito:mockito-core:2.28.2'
     testImplementation "com.google.truth:truth:1.0.1"
-    testImplementation 'joda-time:joda-time:2.10.6'
+    testImplementation 'joda-time:joda-time:2.10.7'
     androidTestImplementation 'androidx.test:core:1.3.0'
     androidTestImplementation 'org.mockito:mockito-android:2.28.2'
 

app/proguard-rules.pro

@@ -23,23 +23,27 @@
 # - Retrofit
 # - Realm
 # - Gson
-# - Butterknife
 # - Jackson
 # - GMS
 # - Crashlytics
 # - Timber
+# - Jackson
 # - Firebase
-# - SpeedDialView
 
+# Activity Transition
 -keep public class android.app.ActivityTransitionCoordinator
 
-# Never obfuscate model classes
--keepclassmembers class at.shockbytes.book.** {
-  *;
+# Do not obfuscate backup models
+-keepclassmembers class at.shockbytes.dante.backup.model.* {
+    <fields>;
+    <init>();
+    <methods>;
 }
-
--keepclassmembers class at.shockbytes.dante.backup.model.** {
-  *;
+-keep class at.shockbytes.dante.core.book.** {*;}
+-keepclassmembers class at.shockbytes.dante.core.book.* {
+    <fields>;
+    <init>();
+    <methods>;
 }
 
 -keepclassmembers class * extends java.lang.Enum {
@@ -70,22 +74,13 @@
 -keep @io.realm.internal.Keep class *
 -dontwarn javax.**
 -dontwarn io.realm.**
--keep class at.shockbytes.util.books.** { *; }
 
 # Retrofit
 -dontnote retrofit2.Platform
 -dontwarn retrofit2.Platform$Java8
 -keepattributes Signature
 -keepattributes Exceptions
 
-# Gson
--keepclassmembers enum * { *; }
-
-# ButterKnife
--keep class butterknife.*
--keepclasseswithmembernames class * { @butterknife.* <methods>; }
--keepclasseswithmembernames class * { @butterknife.* <fields>; }
-
 # Jackson
 -keep class com.fasterxml.jackson.databind.ObjectMapper {
     public <methods>;
@@ -97,6 +92,10 @@
 -keepnames class com.fasterxml.jackson.** { *; }
 -dontwarn com.fasterxml.jackson.databind.**
 
+# Gson
+-keepclassmembers enum * { *; }
+-keep class com.google.** { *;}
+
 # gms
 -keep class com.google.android.gms.** { *; }
 -dontwarn com.google.android.gms.**
@@ -109,7 +108,4 @@
 -dontwarn com.crashlytics.**
 
 # Timber
--dontwarn org.jetbrains.annotations.**
-
-# Activity Transition
--keep public class android.app.ActivityTransitionCoordinator
+-dontwarn org.jetbrains.annotations.**