Update Workflow and README.md (#6)

Author: smashedr

.github/workflows/release.yaml

@@ -10,12 +10,13 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  file: app-release-unsigned.apk
-  name: ${{ github.repository_owner }}.apk
-  path: app/build/outputs/apk/release
+  path: app/build/outputs/apk/release # Output Path
+  output: app-release-unsigned.apk # Output File Name
+  name: ${{ github.repository_owner }}.apk # Final APK Name
   key_name: my-key
   key_file: release.keystore
   tools_path: /usr/local/lib/android/sdk/build-tools/36.0.0
+  cmdline_tools: /usr/local/lib/android/sdk/cmdline-tools/latest/bin
 
 jobs:
   release:
@@ -29,36 +30,38 @@ jobs:
       - name: "Checkout"
         uses: actions/checkout@v4
 
-      - name: "Debug event.json"
+      - name: "Debug Event"
         if: ${{ !github.event.act }}
         continue-on-error: true
         run: |
+          echo "ref: ${{ github.ref }}"
+          echo "event_name: ${{ github.event_name }}"
+
+          echo "::group::cat event.json"
           cat "${GITHUB_EVENT_PATH}"
+          echo "::endgroup::"
 
       - name: "Set Tools Path"
         if: ${{ !github.event.act }}
         run: |
           echo "${{ env.tools_path }}" >> "$GITHUB_PATH"
+          echo "${{ env.cmdline_tools }}" >> "$GITHUB_PATH"
 
-      - name: "Debug Tools"
+      - name: "Verify Tools"
         if: ${{ !github.event.act }}
-        continue-on-error: true
         run: |
-          echo "tools_path: ${{ env.tools_path }}"
+          which keytool
+          which zipalign
+          which apksigner
+          which apkanalyzer
 
           echo "::group::PATH"
           echo "${PATH}"
           echo "::endgroup::"
-
-          echo "::group::ls env.tools_path"
-          ls -lAh "${{ env.tools_path }}/"
+          echo "::group::ls tools_path"
+          ls -lAh "${{ env.tools_path }}"
           echo "::endgroup::"
 
-          echo "--------------------"
-          which keytool
-          which zipalign
-          which apksigner
-
       - name: "Update Version"
         uses: chkfung/[email protected]
         with:
@@ -70,7 +73,12 @@ jobs:
         if: ${{ !github.event.act }}
         continue-on-error: true
         run: |
-          cat "app/build.gradle.kts"
+          echo "versionCode: ${{ github.run_number }}"
+          echo "versionName: ${{ github.ref_name }}"
+
+          echo "::group::cat app/build.gradle.kts"
+          cat app/build.gradle.kts
+          echo "::endgroup::"
 
       - name: "Setup Java"
         uses: actions/setup-java@v4
@@ -82,23 +90,24 @@ jobs:
       - name: "Set Gradle Executable"
         run: chmod +x ./gradlew
 
-      - name: "Gradlew Assemble"
+      - name: "Gradle Assemble"
         run: ./gradlew assembleRelease
 
-      - name: "Debug Build"
-        continue-on-error: true
+      - name: "Verify Build"
         run: |
-          echo "ref: ${{ github.ref }}"
-          echo "path: ${{ env.path }}"
-          echo "path/name: ${{ env.path }}/${{ env.name }}"
-
+          apkanalyzer -h apk summary "${{ env.path }}/${{ env.output }}"
+          
           echo "::group::ls env.path"
           ls -lAh ${{ env.path }}
           echo "::endgroup::"
 
       - name: "Align APK"
         run: |
-          zipalign -v 4 "${{ env.path }}/${{ env.file }}" "${{ env.path }}/${{ env.name }}"
+          zipalign -P 16 -f -v 4 "${{ env.path }}/${{ env.output }}" "${{ env.path }}/${{ env.name }}"
+
+      - name: "Verify Alignment"
+        run: |
+          zipalign -c -P 16 -v 4 "${{ env.path }}/${{ env.name }}"
 
       - name: "Decode Keystore"
         run: |
@@ -107,8 +116,7 @@ jobs:
       - name: "Debug Keystore"
         continue-on-error: true
         run: |
-          stat ${{ env.key_file }}
-          keytool -list -keystore ${{ env.key_file }}
+          echo ${{ secrets.ANDROID_KEYSTORE_PASS }} | keytool -list -keystore ${{ env.key_file }}
 
       - name: "Sign APK"
         run: |
@@ -149,19 +157,13 @@ jobs:
         uses: smashedr/update-release-notes-action@master
         continue-on-error: true
 
-      - name: "Send Failure Notification"
-        if: ${{ failure() && github.event_name == 'release' }}
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-
-      - name: "Job Summary"
+      - name: "Write Job Summary"
         if: ${{ !github.event.act }}
         continue-on-error: true
         run: |
           echo -e "## Android Release\n\n" >> $GITHUB_STEP_SUMMARY
 
-          echo -e "Signed APK: \`${{ env.name }}\`\n\n" >> $GITHUB_STEP_SUMMARY
+          echo -e "Final APK: \`${{ env.name }}\`\n\n" >> $GITHUB_STEP_SUMMARY
 
           echo -e "<details><summary>Build Artifacts</summary>\n\n" >> $GITHUB_STEP_SUMMARY
           echo -e "\`\`\`text\n$(ls -lAh ${{ env.path }})\n\`\`\`\n\n" >> $GITHUB_STEP_SUMMARY
@@ -174,3 +176,9 @@ jobs:
           fi
 
           echo -e "\n\n---" >> $GITHUB_STEP_SUMMARY
+
+      - name: "Send Failure Notification"
+        if: ${{ failure() && github.event_name == 'release' }}
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK }}

README.md

@@ -11,7 +11,7 @@
 
 # Django Files Android App
 
-[![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20Latest%20APK&color=A4C639)](https://github.com/django-files/android-client/releases/latest/download/django-files.apk)
+[![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20for%20Android&color=A4C639)](https://github.com/django-files/android-client/releases/latest/download/django-files.apk)
 
 - [Install](#Install)
   - [Setup](#Setup)
@@ -42,7 +42,7 @@ The URL to the file is automatically copied to the clipboard and the preview is
 > [!TIP]  
 > To install, download and open the [latest release](https://github.com/django-files/android-client/releases/latest).
 >
-> [![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20Latest%20APK&color=A4C639)](https://github.com/django-files/android-client/releases/latest/download/django-files.apk)
+> [![GitHub Release](https://img.shields.io/github/v/release/django-files/android-client?style=for-the-badge&logo=android&label=Download%20for%20Android&color=A4C639)](https://github.com/django-files/android-client/releases/latest/download/django-files.apk)
 
 _Note: Until published on the play store, you may need to allow installation of apps from unknown sources._
 

app/src/main/java/com/djangofiles/djangofiles/MainActivity.kt

@@ -10,6 +10,7 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.OpenableColumns
 import android.util.Log
+import android.view.Gravity
 import android.view.KeyEvent
 import android.view.View
 import android.webkit.WebResourceError
@@ -19,6 +20,7 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.EditText
 import android.widget.LinearLayout
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AlertDialog
@@ -55,6 +57,8 @@ class MainActivity : AppCompatActivity() {
     private lateinit var webView: WebView
     private val client = OkHttpClient()
 
+    private var versionName: String? = null
+
     @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -68,9 +72,10 @@ class MainActivity : AppCompatActivity() {
         webView.settings.javaScriptEnabled = true
 
         val packageInfo = packageManager.getPackageInfo(this.packageName, 0)
-        Log.d("MY_APP_TAG", "versionName: ${packageInfo.versionName}")
+        versionName = packageInfo.versionName
+        Log.d("MY_APP_TAG", "versionName: $versionName")
         val userAgent =
-            "${webView.settings.userAgentString} DjangoFiles Android/${packageInfo.versionName}"
+            "${webView.settings.userAgentString} DjangoFiles Android/${versionName}"
         Log.d("onCreate", "UA: $userAgent")
 
         webView.settings.userAgentString = userAgent
@@ -238,7 +243,7 @@ class MainActivity : AppCompatActivity() {
         // Inflate custom layout with padding
         val layout = LinearLayout(this)
         layout.orientation = LinearLayout.VERTICAL
-        layout.setPadding(5, 0, 5, 120)
+        layout.setPadding(5, 0, 5, 80)
 
         val input = EditText(this)
         input.inputType = android.text.InputType.TYPE_CLASS_TEXT
@@ -248,12 +253,19 @@ class MainActivity : AppCompatActivity() {
         if (savedUrl != null) {
             input.setText(savedUrl)
         }
+
+        val text = TextView(this)
+        text.text = getString(R.string.settings_requires)
+        text.gravity = Gravity.CENTER_HORIZONTAL
+        text.setPadding(0, 20, 0, 0)
+        layout.addView(text)
+
         input.requestFocus()
 
         runOnUiThread {
             AlertDialog.Builder(this)
                 .setCancelable(false)
-                .setTitle(getString(R.string.settings_title))
+                .setTitle("${getString(R.string.app_name)} v$versionName")
                 .setMessage(getString(R.string.settings_message))
                 .setView(layout)
                 .setNegativeButton("Exit") { dialog: DialogInterface?, which: Int -> finish() }

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

@@ -4,6 +4,7 @@
     <string name="settings_title">App Settings</string>
     <string name="settings_message">Set or Change the Django Files URL</string>
     <string name="settings_input_place">your.django-files.com</string>
+    <string name="settings_requires">Requires server version 0.16.0-b7 or greater.</string>
     <string name="tst_invalid_url">Please enter a valid URL.</string>
 
     <string name="tst_not_implemented">Not Implemented.</string>