diff --git a/app/build.gradle b/app/build.gradle index 97cd59e..3684071 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdkVersion 23 targetSdkVersion 30 versionCode 1 - versionName "0.1-alpha3" + versionName "0.1-alpha4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resValue "string", "build_time", buildTime() @@ -20,7 +20,8 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true + shrinkResources true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -41,8 +42,8 @@ dependencies { implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.2' - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.1' implementation 'androidx.security:security-crypto:1.1.0-alpha02' implementation 'androidx.legacy:legacy-support-v4:1.0.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..13a7bfd 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,7 +15,17 @@ # Uncomment this to preserve the line number information for # debugging stack traces. #-keepattributes SourceFile,LineNumberTable +-dontobfuscate # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile +-keep class org.mosad.teapod.util.** { ; } + +#Gson +-keepattributes Signature +-dontwarn sun.misc.** + +#misc +-dontwarn java.lang.instrument.ClassFileTransformer +-dontwarn java.lang.ClassValue diff --git a/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt b/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt index de2f460..c625aed 100644 --- a/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt +++ b/app/src/main/java/org/mosad/teapod/parser/AoDParser.kt @@ -240,10 +240,6 @@ object AoDParser { val secondary = pl.attr("data-otherplaylist") val secondaryIsOmU = secondary.contains("OmU", true) - println("primary: $primary") - println("secondary: $secondary") - println("secondaryIsOmU: $secondaryIsOmU") - // load primary and secondary playlist val primaryPlaylist = parsePlaylistAsync(primary) val secondaryPlaylist = parsePlaylistAsync(secondary) diff --git a/app/src/main/java/org/mosad/teapod/util/TMDBApiController.kt b/app/src/main/java/org/mosad/teapod/util/TMDBApiController.kt index 81a4365..33728c3 100644 --- a/app/src/main/java/org/mosad/teapod/util/TMDBApiController.kt +++ b/app/src/main/java/org/mosad/teapod/util/TMDBApiController.kt @@ -92,13 +92,8 @@ class TMDBApiController { GlobalScope.async { val response = JsonParser.parseString(url.readText()).asJsonObject - //println(response) - val runtime = getStringNotNull(response,"runtime").toInt() - println(runtime) - - - return@async runtime + return@async getStringNotNull(response,"runtime").toInt() }.await() }