Change project structure

.github/workflows/android-test.yml

@@ -16,19 +16,19 @@ jobs:
           submodules: "recursive"
       - name: Check if androidTest folder is not empty
         run: |
-          echo "NOT_EMPTY=$([ "$(ls -A BackupApp/src/androidTest)" ] && echo 'true' || echo 'false')"
-          echo "NOT_EMPTY=$([ "$(ls -A BackupApp/src/androidTest)" ] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
+          echo "NOT_EMPTY=$([ "$(ls -A app/src/androidTest)" ] && echo 'true' || echo 'false')"
+          echo "NOT_EMPTY=$([ "$(ls -A app/src/androidTest)" ] && echo 'true' || echo 'false')" >> $GITHUB_OUTPUT
         id: check-androidTest
       - name: Get min and target sdk
         if: steps.check-androidTest.outputs.NOT_EMPTY == 'true'
         id: get-sdk-version
         run: |
-            echo "MIN_SDK_VERSION=$(cat BackupApp/build.gradle | grep minSdkVersion | rev | cut -d' ' -f 1 | rev)" >> $GITHUB_OUTPUT
-            echo "TARGET_SDK_VERSION=$(cat BackupApp/build.gradle | grep targetSdkVersion | rev | cut -d' ' -f 1 | rev)" >> $GITHUB_OUTPUT
+            echo "MIN_SDK_VERSION=$(cat app/build.gradle | grep minSdkVersion | rev | cut -d' ' -f 1 | rev)" >> $GITHUB_OUTPUT
+            echo "TARGET_SDK_VERSION=$(cat app/build.gradle | grep targetSdkVersion | rev | cut -d' ' -f 1 | rev)" >> $GITHUB_OUTPUT
       - name: Get app ID
         id: get-app-id
         run: |
-            echo "APP_ID=$(cat BackupApp/build.gradle | grep applicationId | rev | cut -d' ' -f 1 | rev | tr -d '"')" >> $GITHUB_OUTPUT
+            echo "APP_ID=$(cat app/build.gradle | grep applicationId | rev | cut -d' ' -f 1 | rev | tr -d '"')" >> $GITHUB_OUTPUT
 
   test:
     needs: check-if-tests-exist
@@ -92,7 +92,8 @@ jobs:
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}} || true
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}}.test || true
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}}.androidTest || true
-            ./gradlew :BackupApp:connectedCheck --stacktrace
+            chmod +x gradlew
+            ./gradlew :app:connectedCheck --stacktrace
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}} || true
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}}.test || true
             adb uninstall ${{needs.check-if-tests-exist.outputs.app-id}}.androidTest || true

.github/workflows/ci.yml

@@ -52,7 +52,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: lint-results-debug
-          path: BackupApp/build/reports/lint-results-debug.html
+          path: app/build/reports/lint-results-debug.html
 
       - name: Build the app
         run: bash ./gradlew build --stacktrace
@@ -64,4 +64,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: debug-apk
-          path: BackupApp/build/outputs/apk/debug/*.apk
+          path: app/build/outputs/apk/debug/*.apk

.gitignore

@@ -34,4 +34,4 @@ Thumbs.db
 *.apk
 /pfa.properties
 /.idea/
-/BackupApp/release
+/app/release

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "BackupAPI"]
-	path = BackupAPI
+	path = libs/privacy-friendly-backup-api
 	url = https://github.com/SecUSo/privacy-friendly-backup-api.git
 [submodule "openpgp-api"]
-	path = openpgp-api
+	path = libs/openpgp-api
 	url = https://github.com/open-keychain/openpgp-api

settings.gradle

@@ -1,8 +1,8 @@
-include ':BackupApp'
+include ':app'
 rootProject.name = "Backup"
 
 include ':BackupAPI'
-project(':BackupAPI').projectDir = new File('BackupAPI/BackupAPI')
+project(':BackupAPI').projectDir = new File('libs/privacy-friendly-backup-api/BackupAPI')
 
 include ':openpgp-api'
-project(':openpgp-api').projectDir = new File('openpgp-api/openpgp-api')
+project(':openpgp-api').projectDir = new File('libs/openpgp-api/openpgp-api')