omh-storage integration

.github/workflows/android-build.yml

@@ -15,6 +15,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -69,6 +72,9 @@ jobs:
     name: Build debug
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-debug-artifact-ondemand.yml

@@ -29,6 +29,9 @@ jobs:
           echo "::set-output name=repo_name::${{ fromJson(steps.request.outputs.data).head.repo.full_name }}"
           echo "::set-output name=repo_clone_url::${{ fromJson(steps.request.outputs.data).head.repo.clone_url }}"
           echo "::set-output name=repo_ssh_url::${{ fromJson(steps.request.outputs.data).head.repo.ssh_url }}"
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - name: Checkout PR Branch
         uses: actions/checkout@v6
         with:

.github/workflows/android-debug-artifact-release.yml

@@ -8,6 +8,9 @@ jobs:
   apk:
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-feature.yml

@@ -16,6 +16,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -40,6 +43,9 @@ jobs:
     name: Build debug and run Jacoco tests
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5

.github/workflows/android-main.yml

@@ -16,6 +16,9 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-latest
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
@@ -37,7 +40,10 @@ jobs:
     name: Build debug, Jacoco test and publish to codacy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 17
@@ -106,6 +112,9 @@ jobs:
       matrix:
         api-level: [ 21, 28 ]
     steps:
+      - name: Export secret to env
+        run: |
+          echo "AMAZE_CLOUD_GOOGLE_CLIENT_ID=${{ secrets.AMAZE_CLOUD_GOOGLE_CLIENT_ID }}" >> $GITHUB_ENV
       - name: checkout
         uses: actions/checkout@v6
       - name: Java 17

.gitignore

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

app/build.gradle

@@ -1,3 +1,6 @@
+import java.util.concurrent.TimeUnit
+import com.android.build.gradle.internal.cxx.configure.GradleLocalPropertiesKt
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
@@ -33,6 +36,10 @@ android {
                               "room.expandProjection": "true"]
             }
         }
+
+        def googleClientId = getValueFromEnvOrProperties("AMAZE_CLOUD_GOOGLE_CLIENT_ID")
+        def bareGoogleClientId = googleClientId.replace(".apps.googleusercontent.com", "")
+        manifestPlaceholders["googleClientIdForRedirect"] = "com.googleusercontent.apps.${bareGoogleClientId}"
     }
 
     signingConfigs {
@@ -54,8 +61,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 +152,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 +177,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'
@@ -199,7 +208,6 @@ dependencies {
     implementation libs.libsu.core
     implementation libs.libsu.io
 
-    playImplementation libs.cloudrail.si.android
     playImplementation libs.junrar
     playImplementation libs.google.play.billing
 
@@ -215,6 +223,7 @@ dependencies {
     implementation libs.commons.net
     //OkHttp
     implementation libs.okhttp
+    implementation libs.okhttp.loggingInterceptor
 
     implementation libs.bcpkix.jdk18on
     implementation libs.bcprov.jdk18on
@@ -234,6 +243,20 @@ dependencies {
         transitive = true
     }
 
+    implementation(libs.google.api.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.oauth.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.http.client) {
+        transitive = false
+    }
+
+    implementation(libs.google.http.client.gson)
+
     //zip4j: support password-protected zips
     implementation libs.zip4j
 
@@ -249,6 +272,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
@@ -257,6 +284,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 {
@@ -265,12 +296,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")
         }
     }
 }
@@ -332,9 +367,15 @@ if (propFile.canRead()) {
     println 'signing.properties not found'
     android.buildTypes.release.signingConfig = null
 }
+
 repositories {
     google()
     mavenCentral()
     maven { url "https://jitpack.io" }
     maven { url "https://jcenter.bintray.com" }
 }
+
+String getValueFromEnvOrProperties(String name) {
+    def localProperties = GradleLocalPropertiesKt.gradleLocalProperties(rootDir, project.providers)
+    return System.getenv(name) ?: localProperties[name]
+}

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.** {*;}