Fixed bugs for release and added proguard rules

app/proguard-rules.pro

@@ -18,4 +18,66 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <1>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+-keepattributes InnerClasses
+
+-keepnames class <1>$$serializer {
+    static <1>$$serializer INSTANCE;
+}
+
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions
+
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+-dontwarn javax.annotation.**
+
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "de.datlag.burningseries",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/main/java/de/datlag/burningseries/ui/fragment/SeriesFragment.kt

@@ -213,6 +213,7 @@ class SeriesFragment : AdvancedFragment(R.layout.fragment_series) {
                 confirmDisabledTextColor(getCompatColor(R.color.defaultContentColor))
                 confirmBackgroundColor(getCompatColor(R.color.defaultContentColor))
                 confirmTextColor(getCompatColor(R.color.defaultBackgroundColor))
+                confirmText(safeContext.getString(R.string.confirm))
                 setExpandState(ExpandState.ExpandOnTv)
                 confirmListener { selected ->
                     if (selected != null) {
@@ -252,6 +253,7 @@ class SeriesFragment : AdvancedFragment(R.layout.fragment_series) {
                 confirmDisabledTextColor(getCompatColor(R.color.defaultContentColor))
                 confirmBackgroundColor(getCompatColor(R.color.defaultContentColor))
                 confirmTextColor(getCompatColor(R.color.defaultBackgroundColor))
+                confirmText(safeContext.getString(R.string.confirm))
                 setExpandState(ExpandState.ExpandOnTv)
                 confirmListener { selected ->
                     if (selected != null) {

app/src/main/res/values-de/strings.xml

@@ -38,7 +38,7 @@
     <string name="watch">Anschauen</string>
     <string name="help_improve_text">Damit die App richtig funktioniert, hängt es von DEINER Hilfe ab. Videos können aufgrund des Captchas nicht immer direkt angesehen werden. Sollte ein Video nicht verfügbar sein, starte es bitte auf der Website (die App fragt automatisch danach). Sobald du es gestartet hast, sollte es auch direkt in der App verfügbar sein. Die folgende Zahl zeigt an, wie viele Videos verfügbar sind:</string>
     <string name="scraped_save_success">Hoster erfolgreich gespeichert. Du kannst jetzt zurückgehen oder weiter surfen und weitere Hoster aktivieren :)</string>
-    <string name="scraped_save_failed">Hoster konnte nicht gespeichert werden. Vielleicht ist es bereits gespeichert, versuchen Sie es mit einem anderen Hoster oder gehen Sie zurück.</string>
+    <string name="scraped_save_failed">Hoster konnte nicht gespeichert werden. Vielleicht ist es bereits gespeichert, versuche es mit einem anderen Hoster oder gehe zurück.</string>
     <string name="stream_unavailable_text">Dieses Video kann nicht gestreamt werden. Hast du deine Netzwerkverbindung überprüft? Du kannst zurückgehen und einen anderen Hoster ausprobieren, das Video im Browser öffnen oder einen Hoster aktivieren, damit es in der App gestreamt werden kann.</string>
     <string name="no_stream_source_text">Anscheinend ist keine Stream Quelle verfügbar. Du kannst es später noch einmal versuchen oder selbst einen Hoster aktivieren. Bitte beachte, dass nicht von allen Hostern gestreamt werden kann.</string>
     <string name="loading_text">Bitte hab etwas Geduld, Daten werden geladen…</string>
@@ -62,4 +62,5 @@
     <string name="no">Nein</string>
     <string name="opensource_libs">OpenSource Bibliotheken</string>
     <string name="github_project">GitHub Projekt</string>
+    <string name="confirm">Bestätigen</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -63,4 +63,5 @@
     <string name="no">No</string>
     <string name="opensource_libs">OpenSource Libraries</string>
     <string name="github_project">GitHub Project</string>
+    <string name="confirm">Confirm</string>
 </resources>

database/consumer-rules.pro

@@ -0,0 +1,56 @@
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+
+
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <1>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+-keepattributes InnerClasses
+
+-keepnames class <1>$$serializer {
+    static <1>$$serializer INSTANCE;
+}
+
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions
+
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+-dontwarn javax.annotation.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*

database/proguard-rules.pro

@@ -18,4 +18,61 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+
+
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <1>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+-keepattributes InnerClasses
+
+-keepnames class <1>$$serializer {
+    static <1>$$serializer INSTANCE;
+}
+
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions
+
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+-dontwarn javax.annotation.**
+
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*

datastore/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+

datastore/proguard-rules.pro

@@ -18,4 +18,8 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable

executor/consumer-rules.pro

@@ -0,0 +1,2 @@
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable

executor/proguard-rules.pro

@@ -18,4 +18,7 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable

model/consumer-rules.pro

@@ -0,0 +1,64 @@
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+
+
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <1>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault,InnerClasses
+
+-if @kotlinx.serialization.Serializable class
+de.datlag.model.m3o.db.Count,
+de.datlag.model.m3o.db.Count$Request,
+de.datlag.model.m3o.image.Convert,
+de.datlag.model.m3o.image.Convert$RequestBase64,
+de.datlag.model.m3o.image.Convert$RequestURL
+{
+    static **$* *;
+}
+-keepnames class <1>$$serializer {
+    static <1>$$serializer INSTANCE;
+}
+
+-keepattributes Signature, InnerClasses, EnclosingMethod
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+-keepattributes AnnotationDefault
+
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn javax.annotation.**
+-dontwarn kotlin.Unit
+-dontwarn retrofit2.KotlinExtensions
+
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+-dontwarn javax.annotation.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+-dontwarn org.codehaus.mojo.animal_sniffer.*