omh-storage integration

.gitignore

@@ -6,6 +6,7 @@
 # Built application files
 *.apk
 *.aar
+!app/libs/*.aar
 *.ap_
 *.aab
 

app/build.gradle

@@ -1,3 +1,5 @@
+import java.util.concurrent.TimeUnit
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
@@ -54,8 +56,8 @@ android {
 
         release {
             signingConfig signingConfigs.release
-
-            minifyEnabled true
+            debuggable true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
             buildConfigField "String", "CRYPTO_IV", "\"LxbHiJhhUXcj\""
             buildConfigField "String", "FTP_SERVER_KEYSTORE_PASSWORD", "\"vishal007\""
@@ -145,6 +147,8 @@ dependencies {
     implementation libs.androidX.constraintLayout
     implementation libs.androidX.multidex //Multiple dex files
     implementation libs.androidX.biometric
+    implementation libs.androidX.security
+    implementation libs.androidX.browser.customtabs
     implementation libs.room.runtime
     implementation libs.room.rxjava2
 
@@ -168,7 +172,7 @@ dependencies {
     testImplementation libs.jsoup
     testImplementation libs.room.migration
     testImplementation libs.mockk
-    testImplementation libs.kotlin.coroutine.test
+    testImplementation libs.kotlin.coroutines.test
     testImplementation libs.androidX.core.testing
     kspTest libs.auto.service
     testImplementation 'ch.qos.logback:logback-classic:1.4.14'
@@ -201,7 +205,6 @@ dependencies {
     implementation libs.libsu.core
     implementation libs.libsu.io
 
-    playImplementation libs.cloudrail.si.android
     playImplementation libs.junrar
     playImplementation libs.google.play.billing
 
@@ -217,6 +220,7 @@ dependencies {
     implementation libs.commons.net
     //OkHttp
     implementation libs.okhttp
+    implementation libs.okhttp.loggingInterceptor
 
     implementation libs.bcpkix.jdk18on
     implementation libs.bcprov.jdk18on
@@ -251,6 +255,10 @@ dependencies {
     implementation project(':file_operations')
     implementation project(':portscanner')
 
+    implementation libs.kotlin.reflect
+    implementation platform(libs.kotlin.coroutines.bom)
+    implementation libs.kotlin.coroutines.android
+    implementation libs.kotlin.coroutines.rxjava2
     implementation libs.kotlin.stdlib.jdk8
     implementation libs.acra.core
     implementation libs.slf4j.api
@@ -259,6 +267,10 @@ dependencies {
 
     implementation libs.gson
     implementation libs.amaze.trashBin
+    implementation libs.retrofit
+    implementation libs.retrofit.jacksonConverter
+    implementation libs.jackson.module.kotlin
+    implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
 }
 
 kotlin {
@@ -267,12 +279,16 @@ kotlin {
 
 configurations.configureEach {
     resolutionStrategy {
+        cacheChangingModulesFor(0, TimeUnit.SECONDS)
         dependencySubstitution {
             substitute module("commons-logging:commons-logging-api:1.1") using module("commons-logging:commons-logging:1.1.1")
             substitute module("com.android.support:support-annotations:27.1.1") using module("com.android.support:support-annotations:27.0.2")
             // These two lines are added to prevent possible class clashes between awaitility (which uses hamcrest 2.1) and junit (which uses hamcrest 1.3).
             substitute module('org.hamcrest:hamcrest-core:1.3') using module("org.hamcrest:hamcrest:2.1")
             substitute module('org.hamcrest:hamcrest-library:1.3') using module("org.hamcrest:hamcrest:2.1")
+            // Force coroutines to a specific version to avoid conflicts
+            substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
+            substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-android:*") using module("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
         }
     }
 }

app/proguard.cfg

@@ -69,9 +69,6 @@
     public static final int define_*;
 }
 
-#From here CloudRail
--keep class com.cloudrail.** { *; }
-
 #From here BouncyCastle
 -keep class org.bouncycastle.crypto.* {*;}
 -keep class org.bouncycastle.crypto.agreement.** {*;}