Merge pull request #103 from TeamAmaze/feature

Update ci
TeamAmaze · Apr 15, 2023 · 64725a8 · 64725a8
2 parents d554856 + 78b60c1
commit 64725a8
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 36 deletions.
diff --git a/.github/workflows/android-main.yml b/.github/workflows/android-main.yml
@@ -15,40 +15,50 @@ jobs:
     name: Check spotless
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: "temurin"
           java-version: 11
-          cache: 'gradle'
       - name: Check formatting using spotless
-        run: ./gradlew spotlessCheck
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: spotlessCheck
   build:
     name: Build debug
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: "temurin"
           java-version: 11
-          cache: 'gradle'
       - name: Build with Gradle
-        run: |
-          ./gradlew assembleDebug
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembledebug
         env:
           TZ: UTC
       - name: Publish on Telegram
         run: |
           COMMIT_COUNT=$(git rev-list --count ${GITHUB_REF})
-          cd app/build/outputs/apk/debug
-          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-arm64-v8a-debug.7z app-arm64-v8a-debug.apk
-          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-armeabi-v7a-debug.7z app-armeabi-v7a-debug.apk
-          cp app-arm64-v8a-debug.7z amaze-utils-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z
-          cp app-armeabi-v7a-debug.7z amaze-utils-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z
-          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
-          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
+          working_dir=$PWD
+          cd app/build/outputs/apk/fdroid/debug
+          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-fdroid-arm64-v8a-debug.7z app-fdroid-arm64-v8a-debug.apk
+          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-fdroid-armeabi-v7a-debug.7z app-fdroid-armeabi-v7a-debug.apk
+          cp app-fdroid-arm64-v8a-debug.7z amaze-utils-fdroid-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z
+          cp app-fdroid-armeabi-v7a-debug.7z amaze-utils-fdroid-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z
+          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-fdroid-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
+          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-fdroid-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
+          cd $working_dir
+          cd app/build/outputs/apk/play/debug
+          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-play-arm64-v8a-debug.7z app-play-arm64-v8a-debug.apk
+          7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on app-play-armeabi-v7a-debug.7z app-play-armeabi-v7a-debug.apk
+          cp app-play-arm64-v8a-debug.7z amaze-utils-play-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z
+          cp app-play-armeabi-v7a-debug.7z amaze-utils-play-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z
+          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-play-arm64-v8a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
+          echo $(curl -v -F "chat_id=${{ secrets.TELEGRAM_CHAT_ID }}" --header "Content-Type: multipart/form-data" -F document=@amaze-utils-play-armeabi-v7a-v0.1-$(echo $COMMIT_COUNT).7z https://api.telegram.org/${{ secrets.AMAZE_BOT_ID }}:${{ secrets.TELEGRAM_INTEGRATION_KEY }}/sendDocument)
diff --git a/.gitignore b/.gitignore
@@ -332,5 +332,4 @@ captures
 
 # sign config
 signing.properties
-crowdin.properties
-application.properties
+crowdin.properties
diff --git a/app/src/main/java/com/amaze/fileutilities/video_player/SubtitlesApi.kt b/app/src/main/java/com/amaze/fileutilities/video_player/SubtitlesApi.kt
@@ -26,7 +26,7 @@ import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.GET
-import retrofit2.http.Headers
+import retrofit2.http.HeaderMap
 import retrofit2.http.POST
 import retrofit2.http.Query
 import retrofit2.http.Streaming
@@ -39,34 +39,27 @@ interface SubtitlesApi {
         const val API_SEARCH_SUBTITLES = "subtitles"
         const val API_DOWNLOAD_SUBTITLES = "download"
         const val API_LANGUAGE = "infos/languages"
-        private const val API_KEY = BuildConfig.OPENSUBTITLES_API_KEY
+        private val API_KEY = BuildConfig.OPENSUBTITLES_API_KEY
         private const val USER_AGENT = "AmazeFileUtils"
+        val HEADER_API_KEY_MAP = mapOf(
+            Pair("Api-Key", API_KEY),
+            Pair("User-Agent", USER_AGENT), Pair("Accept", "application/json")
+        )
     }
 
-    @Headers(value = ["Accept: application/json", "Api-Key: $API_KEY", "User-Agent: $USER_AGENT"])
     @GET(API_LANGUAGE)
-    fun getLanguageList(): Call<LanguageResult>?
+    fun getLanguageList(@HeaderMap headersMap: Map<String, String>): Call<LanguageResult>?
 
-    @Headers(
-        value = [
-            "Accept: application/json",
-            "Api-Key: $API_KEY", "User-Agent: $USER_AGENT"
-        ]
-    )
     @GET(API_SEARCH_SUBTITLES)
     fun getSearchResults(
+        @HeaderMap headersMap: Map<String, String>,
         @Query(value = "query") query: String,
         @Query(value = "languages") languages: String
     ): Call<SearchResultsResponse>?
 
-    @Headers(
-        value = [
-            "Accept: application/json",
-            "Content-type:application/json", "Api-Key: $API_KEY", "User-Agent: $USER_AGENT"
-        ]
-    )
     @POST(API_DOWNLOAD_SUBTITLES)
     fun getDownloadLink(
+        @HeaderMap headersMap: Map<String, String>,
         @Body downloadLinkRequest: GetDownloadLinkRequest
     ): Call<GetDownloadLinkResponse>?
 

diff --git a/app/src/main/java/com/amaze/fileutilities/video_player/VideoPlayerActivityViewModel.kt b/app/src/main/java/com/amaze/fileutilities/video_player/VideoPlayerActivityViewModel.kt
@@ -91,7 +91,7 @@ class VideoPlayerActivityViewModel : ViewModel() {
                 .client(Utils.getOkHttpClient())
                 .build()
             val service = retrofit.create(SubtitlesApi::class.java)
-            service.getLanguageList()?.execute()?.let {
+            service.getLanguageList(SubtitlesApi.HEADER_API_KEY_MAP)?.execute()?.let {
                 response ->
                 if (response.isSuccessful && response.body() != null) {
                     val languageResponse = response.body()!!
@@ -175,7 +175,10 @@ class VideoPlayerActivityViewModel : ViewModel() {
             val languageListRequestString = languageList.map { it.code }.filter { it.isNotEmpty() }
                 .joinToString(",")
 
-            service.getSearchResults(movieName, languageListRequestString)?.execute()?.let {
+            service.getSearchResults(
+                SubtitlesApi.HEADER_API_KEY_MAP, movieName,
+                languageListRequestString
+            )?.execute()?.let {
                 response ->
                 if (response.isSuccessful && response.body() != null) {
                     val searchResultsResponse = response.body()!!
@@ -312,6 +315,7 @@ class VideoPlayerActivityViewModel : ViewModel() {
             .build()
         val service = retrofit.create(SubtitlesApi::class.java)
         service.getDownloadLink(
+            SubtitlesApi.HEADER_API_KEY_MAP,
             SubtitlesApi.GetDownloadLinkRequest(
                 fileId
             )

diff --git a/application.properties b/application.properties
@@ -0,0 +1,19 @@
+BASE_CLOUD_FUNC="https://us-central1-useful-cathode-91310.cloudfunctions.net"
+BASE_API_STICKER_PACK="https://us-central1-useful-cathode-91310.cloudfunctions.net/amaze-utils-sticker-pack/"
+API_REQ_TRIAL_URI="/amaze-utils-fdroid-trial-validator"
+API_REQ_TRIAL_AUTH_TOKEN="unk2G2vXc*qsKu"
+API_REQ_TRIAL_APP_HASH="Aw4$B4VfR#V^*7"
+API_REQ_STICKER_PACK_TOKEN="c2PxRdya"
+OPENSUBTITLES_API_KEY_RELEASE="5CZlDmqIhLoRcalZHXItm5Thwq57MDE2"
+API_REQ_TRIAL_CODE_TRIAL_ACTIVE=12341343
+API_REQ_TRIAL_CODE_TRIAL_EXPIRED=24523424
+API_REQ_TRIAL_CODE_TRIAL_INACTIVE=33452345
+API_REQ_TRIAL_CODE_TRIAL_EXCLUSIVE=45345234
+API_REQ_TRIAL_CODE_TRIAL_UNOFFICIAL=34534247
+API_REQ_TRIAL_TRIAL_ACTIVE="trial_active"
+API_REQ_TRIAL_TRIAL_EXPIRED="trial_expired"
+API_REQ_TRIAL_TRIAL_INACTIVE="trial_inactive"
+API_REQ_TRIAL_TRIAL_EXCLUSIVE="trial_exclusive"
+API_REQ_TRIAL_TRIAL_UNOFFICIAL="trial_unofficial"
+API_REQ_TRIAL_YEARLY="Yearly"
+SALT_DEVICE_ID="#%36zkpCE2"