Restructure project to match other apps

- Move `BackupAPI` to `libs/privacy-friendly-backup-api` - Rename `BackupApp` directory to `app` - Move `openpgp-api` to `libs/openpgp-api`
SecUSo · Dec 4, 2024 · b1efc48 · b1efc48
1 parent 81826dc
commit b1efc48
Show file tree

Hide file tree

Showing 169 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.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
diff --git a/BackupApp/.gitignore → app/.gitignore b/BackupApp/.gitignore → app/.gitignore
diff --git a/BackupApp/build.gradle → app/build.gradle b/BackupApp/build.gradle → app/build.gradle
diff --git a/BackupApp/lint.xml → app/lint.xml b/BackupApp/lint.xml → app/lint.xml
diff --git a/BackupApp/proguard-rules.pro → app/proguard-rules.pro b/BackupApp/proguard-rules.pro → app/proguard-rules.pro
diff --git a/...dlybackup.data.room.BackupDatabase/1.json → ...dlybackup.data.room.BackupDatabase/1.json b/...dlybackup.data.room.BackupDatabase/1.json → ...dlybackup.data.room.BackupDatabase/1.json
diff --git a/...dlybackup.data.room.BackupDatabase/2.json → ...dlybackup.data.room.BackupDatabase/2.json b/...dlybackup.data.room.BackupDatabase/2.json → ...dlybackup.data.room.BackupDatabase/2.json
diff --git a/...secuso/privacyfriendlybackup/DriveTest.kt → ...secuso/privacyfriendlybackup/DriveTest.kt b/...secuso/privacyfriendlybackup/DriveTest.kt → ...secuso/privacyfriendlybackup/DriveTest.kt
diff --git a/...so/privacyfriendlybackup/SignatureTest.kt → ...so/privacyfriendlybackup/SignatureTest.kt b/...so/privacyfriendlybackup/SignatureTest.kt → ...so/privacyfriendlybackup/SignatureTest.kt
diff --git a/...ecuso/privacyfriendlybackup/WorkerTest.kt → ...ecuso/privacyfriendlybackup/WorkerTest.kt b/...ecuso/privacyfriendlybackup/WorkerTest.kt → ...ecuso/privacyfriendlybackup/WorkerTest.kt
diff --git a/BackupApp/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/BackupApp/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/BackupApp/src/main/assets/Signatures.json → app/src/main/assets/Signatures.json b/BackupApp/src/main/assets/Signatures.json → app/src/main/assets/Signatures.json
diff --git a/...rivacyfriendlybackup/BackupApplication.kt → ...rivacyfriendlybackup/BackupApplication.kt b/...rivacyfriendlybackup/BackupApplication.kt → ...rivacyfriendlybackup/BackupApplication.kt
diff --git a/...endlybackup/backupapi/PfaApiConnection.kt → ...endlybackup/backupapi/PfaApiConnection.kt b/...endlybackup/backupapi/PfaApiConnection.kt → ...endlybackup/backupapi/PfaApiConnection.kt
diff --git a/...ackup/data/BackupDataStorageRepository.kt → ...ackup/data/BackupDataStorageRepository.kt b/...ackup/data/BackupDataStorageRepository.kt → ...ackup/data/BackupDataStorageRepository.kt
diff --git a/...cyfriendlybackup/data/BackupJobManager.kt → ...cyfriendlybackup/data/BackupJobManager.kt b/...cyfriendlybackup/data/BackupJobManager.kt → ...cyfriendlybackup/data/BackupJobManager.kt
diff --git a/...lybackup/data/apps/PFApplicationHelper.kt → ...lybackup/data/apps/PFApplicationHelper.kt b/...lybackup/data/apps/PFApplicationHelper.kt → ...lybackup/data/apps/PFApplicationHelper.kt
diff --git a/...endlybackup/data/cache/DecryptionCache.kt → ...endlybackup/data/cache/DecryptionCache.kt b/...endlybackup/data/cache/DecryptionCache.kt → ...endlybackup/data/cache/DecryptionCache.kt
diff --git a/...lybackup/data/cache/DecryptionMetaData.kt → ...lybackup/data/cache/DecryptionMetaData.kt b/...lybackup/data/cache/DecryptionMetaData.kt → ...lybackup/data/cache/DecryptionMetaData.kt
diff --git a/...lybackup/data/cloud/WebserviceProvider.kt → ...lybackup/data/cloud/WebserviceProvider.kt b/...lybackup/data/cloud/WebserviceProvider.kt → ...lybackup/data/cloud/WebserviceProvider.kt
diff --git a/...ackup/data/cloud/drive/DriveRepository.kt → ...ackup/data/cloud/drive/DriveRepository.kt b/...ackup/data/cloud/drive/DriveRepository.kt → ...ackup/data/cloud/drive/DriveRepository.kt
diff --git a/...lybackup/data/cloud/drive/DriveService.kt → ...lybackup/data/cloud/drive/DriveService.kt b/...lybackup/data/cloud/drive/DriveService.kt → ...lybackup/data/cloud/drive/DriveService.kt
diff --git a/...kup/data/cloud/drive/GoogleDriveHelper.kt → ...kup/data/cloud/drive/GoogleDriveHelper.kt b/...kup/data/cloud/drive/GoogleDriveHelper.kt → ...kup/data/cloud/drive/GoogleDriveHelper.kt
diff --git a/...backup/data/cloud/retrofit/ApiResponse.kt → ...backup/data/cloud/retrofit/ApiResponse.kt b/...backup/data/cloud/retrofit/ApiResponse.kt → ...backup/data/cloud/retrofit/ApiResponse.kt
diff --git a/...ata/cloud/retrofit/LiveDataCallAdapter.kt → ...ata/cloud/retrofit/LiveDataCallAdapter.kt b/...ata/cloud/retrofit/LiveDataCallAdapter.kt → ...ata/cloud/retrofit/LiveDataCallAdapter.kt
diff --git a/...ud/retrofit/LiveDataCallAdapterFactory.kt → ...ud/retrofit/LiveDataCallAdapterFactory.kt b/...ud/retrofit/LiveDataCallAdapterFactory.kt → ...ud/retrofit/LiveDataCallAdapterFactory.kt
diff --git a/...endlybackup/data/exporter/DataExporter.kt → ...endlybackup/data/exporter/DataExporter.kt b/...endlybackup/data/exporter/DataExporter.kt → ...endlybackup/data/exporter/DataExporter.kt
diff --git a/...external/ExternalBackupDataStoreHelper.kt → ...external/ExternalBackupDataStoreHelper.kt b/...external/ExternalBackupDataStoreHelper.kt → ...external/ExternalBackupDataStoreHelper.kt
diff --git a/...endlybackup/data/importer/DataImporter.kt → ...endlybackup/data/importer/DataImporter.kt b/...endlybackup/data/importer/DataImporter.kt → ...endlybackup/data/importer/DataImporter.kt
diff --git a/...internal/InternalBackupDataStoreHelper.kt → ...internal/InternalBackupDataStoreHelper.kt b/...internal/InternalBackupDataStoreHelper.kt → ...internal/InternalBackupDataStoreHelper.kt
diff --git a/...riendlybackup/data/room/BackupDatabase.kt → ...riendlybackup/data/room/BackupDatabase.kt b/...riendlybackup/data/room/BackupDatabase.kt → ...riendlybackup/data/room/BackupDatabase.kt
diff --git a/...backup/data/room/converters/Converters.kt → ...backup/data/room/converters/Converters.kt b/...backup/data/room/converters/Converters.kt → ...backup/data/room/converters/Converters.kt
diff --git a/...endlybackup/data/room/dao/BackupJobDao.kt → ...endlybackup/data/room/dao/BackupJobDao.kt b/...endlybackup/data/room/dao/BackupJobDao.kt → ...endlybackup/data/room/dao/BackupJobDao.kt
diff --git a/...backup/data/room/dao/BackupMetaDataDao.kt → ...backup/data/room/dao/BackupMetaDataDao.kt b/...backup/data/room/dao/BackupMetaDataDao.kt → ...backup/data/room/dao/BackupMetaDataDao.kt
diff --git a/...up/data/room/dao/InternalBackupDataDao.kt → ...up/data/room/dao/InternalBackupDataDao.kt b/...up/data/room/dao/InternalBackupDataDao.kt → ...up/data/room/dao/InternalBackupDataDao.kt
diff --git a/...friendlybackup/data/room/dao/PFAJobDao.kt → ...friendlybackup/data/room/dao/PFAJobDao.kt b/...friendlybackup/data/room/dao/PFAJobDao.kt → ...friendlybackup/data/room/dao/PFAJobDao.kt
diff --git a/...iendlybackup/data/room/model/BackupJob.kt → ...iendlybackup/data/room/model/BackupJob.kt b/...iendlybackup/data/room/model/BackupJob.kt → ...iendlybackup/data/room/model/BackupJob.kt
diff --git a/...kup/data/room/model/InternalBackupData.kt → ...kup/data/room/model/InternalBackupData.kt b/...kup/data/room/model/InternalBackupData.kt → ...kup/data/room/model/InternalBackupData.kt
diff --git a/...yfriendlybackup/data/room/model/PFAJob.kt → ...yfriendlybackup/data/room/model/PFAJob.kt b/...yfriendlybackup/data/room/model/PFAJob.kt → ...yfriendlybackup/data/room/model/PFAJob.kt
diff --git a/...p/data/room/model/StoredBackupMetaData.kt → ...p/data/room/model/StoredBackupMetaData.kt b/...p/data/room/model/StoredBackupMetaData.kt → ...p/data/room/model/StoredBackupMetaData.kt
diff --git a/...backup/data/room/model/enums/JobAction.kt → ...backup/data/room/model/enums/JobAction.kt b/...backup/data/room/model/enums/JobAction.kt → ...backup/data/room/model/enums/JobAction.kt
diff --git a/...ckup/data/room/model/enums/StorageType.kt → ...ckup/data/room/model/enums/StorageType.kt b/...ckup/data/room/model/enums/StorageType.kt → ...ckup/data/room/model/enums/StorageType.kt
diff --git a/...iendlybackup/preference/PreferenceKeys.kt → ...iendlybackup/preference/PreferenceKeys.kt b/...iendlybackup/preference/PreferenceKeys.kt → ...iendlybackup/preference/PreferenceKeys.kt
diff --git a/...yfriendlybackup/services/BackupService.kt → ...yfriendlybackup/services/BackupService.kt b/...yfriendlybackup/services/BackupService.kt → ...yfriendlybackup/services/BackupService.kt
diff --git a/...ckup/ui/application/ApplicationAdapter.kt → ...ckup/ui/application/ApplicationAdapter.kt b/...ckup/ui/application/ApplicationAdapter.kt → ...ckup/ui/application/ApplicationAdapter.kt
diff --git a/...pplication/ApplicationOverviewFragment.kt → ...pplication/ApplicationOverviewFragment.kt b/...pplication/ApplicationOverviewFragment.kt → ...pplication/ApplicationOverviewFragment.kt
diff --git a/...plication/ApplicationOverviewViewModel.kt → ...plication/ApplicationOverviewViewModel.kt b/...plication/ApplicationOverviewViewModel.kt → ...plication/ApplicationOverviewViewModel.kt
diff --git a/...backup/ui/application/BackupJobAdapter.kt → ...backup/ui/application/BackupJobAdapter.kt b/...backup/ui/application/BackupJobAdapter.kt → ...backup/ui/application/BackupJobAdapter.kt
diff --git a/...riendlybackup/ui/application/GroupList.kt → ...riendlybackup/ui/application/GroupList.kt b/...riendlybackup/ui/application/GroupList.kt → ...riendlybackup/ui/application/GroupList.kt
diff --git a/...ackup/ui/backup/BackupOverviewFragment.kt → ...ackup/ui/backup/BackupOverviewFragment.kt b/...ackup/ui/backup/BackupOverviewFragment.kt → ...ackup/ui/backup/BackupOverviewFragment.kt
diff --git a/...ckup/ui/backup/BackupOverviewViewModel.kt → ...ckup/ui/backup/BackupOverviewViewModel.kt b/...ckup/ui/backup/BackupOverviewViewModel.kt → ...ckup/ui/backup/BackupOverviewViewModel.kt
diff --git a/...ckup/ui/backup/FilterableBackupAdapter.kt → ...ckup/ui/backup/FilterableBackupAdapter.kt b/...ckup/ui/backup/FilterableBackupAdapter.kt → ...ckup/ui/backup/FilterableBackupAdapter.kt
diff --git a/...yfriendlybackup/ui/common/BaseFragment.kt → ...yfriendlybackup/ui/common/BaseFragment.kt b/...yfriendlybackup/ui/common/BaseFragment.kt → ...yfriendlybackup/ui/common/BaseFragment.kt
diff --git a/...ckup/ui/common/DisplayMenuItemActivity.kt → ...ckup/ui/common/DisplayMenuItemActivity.kt b/...ckup/ui/common/DisplayMenuItemActivity.kt → ...ckup/ui/common/DisplayMenuItemActivity.kt
diff --git a/...o/privacyfriendlybackup/ui/common/Mode.kt → ...o/privacyfriendlybackup/ui/common/Mode.kt b/...o/privacyfriendlybackup/ui/common/Mode.kt → ...o/privacyfriendlybackup/ui/common/Mode.kt
diff --git a/...lybackup/ui/common/PlaceholderFragment.kt → ...lybackup/ui/common/PlaceholderFragment.kt b/...lybackup/ui/common/PlaceholderFragment.kt → ...lybackup/ui/common/PlaceholderFragment.kt
diff --git a/.../encryption/EncryptionSettingsActivity.kt → .../encryption/EncryptionSettingsActivity.kt b/.../encryption/EncryptionSettingsActivity.kt → .../encryption/EncryptionSettingsActivity.kt
diff --git a/.../encryption/EncryptionSettingsFragment.kt → .../encryption/EncryptionSettingsFragment.kt b/.../encryption/EncryptionSettingsFragment.kt → .../encryption/EncryptionSettingsFragment.kt
diff --git a/...ui/encryption/OpenPgpAppDialogFragment.kt → ...ui/encryption/OpenPgpAppDialogFragment.kt b/...ui/encryption/OpenPgpAppDialogFragment.kt → ...ui/encryption/OpenPgpAppDialogFragment.kt
diff --git a/...p/ui/encryption/OpenPgpAppPreference.java → ...p/ui/encryption/OpenPgpAppPreference.java b/...p/ui/encryption/OpenPgpAppPreference.java → ...p/ui/encryption/OpenPgpAppPreference.java
diff --git a/...p/ui/encryption/OpenPgpKeyPreference.java → ...p/ui/encryption/OpenPgpKeyPreference.java b/...p/ui/encryption/OpenPgpKeyPreference.java → ...p/ui/encryption/OpenPgpKeyPreference.java
diff --git a/...yption/UserInteractionRequiredActivity.kt → ...yption/UserInteractionRequiredActivity.kt b/...yption/UserInteractionRequiredActivity.kt → ...yption/UserInteractionRequiredActivity.kt
diff --git a/...lybackup/ui/help/ExpandableListAdapter.kt → ...lybackup/ui/help/ExpandableListAdapter.kt b/...lybackup/ui/help/ExpandableListAdapter.kt → ...lybackup/ui/help/ExpandableListAdapter.kt
diff --git a/...acyfriendlybackup/ui/help/HelpDataDump.kt → ...acyfriendlybackup/ui/help/HelpDataDump.kt b/...acyfriendlybackup/ui/help/HelpDataDump.kt → ...acyfriendlybackup/ui/help/HelpDataDump.kt
diff --git a/...acyfriendlybackup/ui/help/HelpFragment.kt → ...acyfriendlybackup/ui/help/HelpFragment.kt b/...acyfriendlybackup/ui/help/HelpFragment.kt → ...acyfriendlybackup/ui/help/HelpFragment.kt
diff --git a/...p/ui/importbackup/ImportBackupActivity.kt → ...p/ui/importbackup/ImportBackupActivity.kt b/...p/ui/importbackup/ImportBackupActivity.kt → ...p/ui/importbackup/ImportBackupActivity.kt
diff --git a/...p/ui/inspection/DataInspectionActivity.kt → ...p/ui/inspection/DataInspectionActivity.kt b/...p/ui/inspection/DataInspectionActivity.kt → ...p/ui/inspection/DataInspectionActivity.kt
diff --git a/...up/ui/inspection/DataInspectionAdapter.kt → ...up/ui/inspection/DataInspectionAdapter.kt b/...up/ui/inspection/DataInspectionAdapter.kt → ...up/ui/inspection/DataInspectionAdapter.kt
diff --git a/...p/ui/inspection/DataInspectionFragment.kt → ...p/ui/inspection/DataInspectionFragment.kt b/...p/ui/inspection/DataInspectionFragment.kt → ...p/ui/inspection/DataInspectionFragment.kt
diff --git a/.../ui/inspection/DataInspectionViewModel.kt → .../ui/inspection/DataInspectionViewModel.kt b/.../ui/inspection/DataInspectionViewModel.kt → .../ui/inspection/DataInspectionViewModel.kt
diff --git a/...riendlybackup/ui/inspection/LoadStatus.kt → ...riendlybackup/ui/inspection/LoadStatus.kt b/...riendlybackup/ui/inspection/LoadStatus.kt → ...riendlybackup/ui/inspection/LoadStatus.kt
diff --git a/...cyfriendlybackup/ui/main/AboutFragment.kt → ...cyfriendlybackup/ui/main/AboutFragment.kt b/...cyfriendlybackup/ui/main/AboutFragment.kt → ...cyfriendlybackup/ui/main/AboutFragment.kt
diff --git a/...acyfriendlybackup/ui/main/MainActivity.kt → ...acyfriendlybackup/ui/main/MainActivity.kt b/...acyfriendlybackup/ui/main/MainActivity.kt → ...acyfriendlybackup/ui/main/MainActivity.kt
diff --git a/...dlybackup/ui/settings/SettingsFragment.kt → ...dlybackup/ui/settings/SettingsFragment.kt b/...dlybackup/ui/settings/SettingsFragment.kt → ...dlybackup/ui/settings/SettingsFragment.kt
diff --git a/...vacyfriendlybackup/util/BackupDataUtil.kt → ...vacyfriendlybackup/util/BackupDataUtil.kt b/...vacyfriendlybackup/util/BackupDataUtil.kt → ...vacyfriendlybackup/util/BackupDataUtil.kt
diff --git a/...lybackup/worker/BackupJobManagerWorker.kt → ...lybackup/worker/BackupJobManagerWorker.kt b/...lybackup/worker/BackupJobManagerWorker.kt → ...lybackup/worker/BackupJobManagerWorker.kt
diff --git a/...friendlybackup/worker/EncryptionWorker.kt → ...friendlybackup/worker/EncryptionWorker.kt b/...friendlybackup/worker/EncryptionWorker.kt → ...friendlybackup/worker/EncryptionWorker.kt
diff --git a/...privacyfriendlybackup/worker/PfaWorker.kt → ...privacyfriendlybackup/worker/PfaWorker.kt b/...privacyfriendlybackup/worker/PfaWorker.kt → ...privacyfriendlybackup/worker/PfaWorker.kt
diff --git a/...ivacyfriendlybackup/worker/StoreWorker.kt → ...ivacyfriendlybackup/worker/StoreWorker.kt b/...ivacyfriendlybackup/worker/StoreWorker.kt → ...ivacyfriendlybackup/worker/StoreWorker.kt
diff --git a/...riendlybackup/worker/datakeys/DataKeys.kt → ...riendlybackup/worker/datakeys/DataKeys.kt b/...riendlybackup/worker/datakeys/DataKeys.kt → ...riendlybackup/worker/datakeys/DataKeys.kt
diff --git a/...main/res/drawable-hdpi/ic_stat_backup.png → ...main/res/drawable-hdpi/ic_stat_backup.png b/...main/res/drawable-hdpi/ic_stat_backup.png → ...main/res/drawable-hdpi/ic_stat_backup.png
diff --git a/...main/res/drawable-mdpi/ic_stat_backup.png → ...main/res/drawable-mdpi/ic_stat_backup.png b/...main/res/drawable-mdpi/ic_stat_backup.png → ...main/res/drawable-mdpi/ic_stat_backup.png
diff --git a/...ain/res/drawable-xhdpi/ic_stat_backup.png → ...ain/res/drawable-xhdpi/ic_stat_backup.png b/...ain/res/drawable-xhdpi/ic_stat_backup.png → ...ain/res/drawable-xhdpi/ic_stat_backup.png
diff --git a/...in/res/drawable-xxhdpi/ic_stat_backup.png → ...in/res/drawable-xxhdpi/ic_stat_backup.png b/...in/res/drawable-xxhdpi/ic_stat_backup.png → ...in/res/drawable-xxhdpi/ic_stat_backup.png
diff --git a/...n/res/drawable-xxxhdpi/ic_stat_backup.png → ...n/res/drawable-xxxhdpi/ic_stat_backup.png b/...n/res/drawable-xxxhdpi/ic_stat_backup.png → ...n/res/drawable-xxxhdpi/ic_stat_backup.png
diff --git a/...App/src/main/res/drawable/ic_about_24.xml → app/src/main/res/drawable/ic_about_24.xml b/...App/src/main/res/drawable/ic_about_24.xml → app/src/main/res/drawable/ic_about_24.xml
diff --git a/...pApp/src/main/res/drawable/ic_apps_24.xml → app/src/main/res/drawable/ic_apps_24.xml b/...pApp/src/main/res/drawable/ic_apps_24.xml → app/src/main/res/drawable/ic_apps_24.xml
diff --git a/...rc/main/res/drawable/ic_arrow_back_24.xml → ...rc/main/res/drawable/ic_arrow_back_24.xml b/...rc/main/res/drawable/ic_arrow_back_24.xml → ...rc/main/res/drawable/ic_arrow_back_24.xml
diff --git a/...pp/src/main/res/drawable/ic_backup_24.xml → app/src/main/res/drawable/ic_backup_24.xml b/...pp/src/main/res/drawable/ic_backup_24.xml → app/src/main/res/drawable/ic_backup_24.xml
diff --git a/...ble/ic_baseline_add_circle_outline_24.xml → ...ble/ic_baseline_add_circle_outline_24.xml b/...ble/ic_baseline_add_circle_outline_24.xml → ...ble/ic_baseline_add_circle_outline_24.xml
diff --git a/...drawable/ic_baseline_error_outline_24.xml → ...drawable/ic_baseline_error_outline_24.xml b/...drawable/ic_baseline_error_outline_24.xml → ...drawable/ic_baseline_error_outline_24.xml
diff --git a/...res/drawable/ic_baseline_file_copy_24.xml → ...res/drawable/ic_baseline_file_copy_24.xml b/...res/drawable/ic_baseline_file_copy_24.xml → ...res/drawable/ic_baseline_file_copy_24.xml
diff --git a/...drawable/ic_baseline_no_encryption_24.xml → ...drawable/ic_baseline_no_encryption_24.xml b/...drawable/ic_baseline_no_encryption_24.xml → ...drawable/ic_baseline_no_encryption_24.xml
diff --git a/...rawable/ic_baseline_phonelink_lock_24.xml → ...rawable/ic_baseline_phonelink_lock_24.xml b/...rawable/ic_baseline_phonelink_lock_24.xml → ...rawable/ic_baseline_phonelink_lock_24.xml
diff --git a/.../res/drawable/ic_baseline_save_alt_24.xml → .../res/drawable/ic_baseline_save_alt_24.xml b/.../res/drawable/ic_baseline_save_alt_24.xml → .../res/drawable/ic_baseline_save_alt_24.xml
diff --git a/...es/drawable/ic_baseline_smartphone_24.xml → ...es/drawable/ic_baseline_smartphone_24.xml b/...es/drawable/ic_baseline_smartphone_24.xml → ...es/drawable/ic_baseline_smartphone_24.xml
diff --git a/...App/src/main/res/drawable/ic_check_24.xml → app/src/main/res/drawable/ic_check_24.xml b/...App/src/main/res/drawable/ic_check_24.xml → app/src/main/res/drawable/ic_check_24.xml
diff --git a/...src/main/res/drawable/ic_check_box_24.xml → ...src/main/res/drawable/ic_check_box_24.xml b/...src/main/res/drawable/ic_check_box_24.xml → ...src/main/res/drawable/ic_check_box_24.xml
diff --git a/...rawable/ic_check_box_outline_blank_24.xml → ...rawable/ic_check_box_outline_blank_24.xml b/...rawable/ic_check_box_outline_blank_24.xml → ...rawable/ic_check_box_outline_blank_24.xml
diff --git a/...App/src/main/res/drawable/ic_close_24.xml → app/src/main/res/drawable/ic_close_24.xml b/...App/src/main/res/drawable/ic_close_24.xml → app/src/main/res/drawable/ic_close_24.xml
diff --git a/...App/src/main/res/drawable/ic_cloud_24.xml → app/src/main/res/drawable/ic_cloud_24.xml b/...App/src/main/res/drawable/ic_cloud_24.xml → app/src/main/res/drawable/ic_cloud_24.xml
diff --git a/...ain/res/drawable/ic_cloud_download_24.xml → ...ain/res/drawable/ic_cloud_download_24.xml b/...ain/res/drawable/ic_cloud_download_24.xml → ...ain/res/drawable/ic_cloud_download_24.xml
diff --git a/.../main/res/drawable/ic_cloud_upload_24.xml → .../main/res/drawable/ic_cloud_upload_24.xml b/.../main/res/drawable/ic_cloud_upload_24.xml → .../main/res/drawable/ic_cloud_upload_24.xml
diff --git a/...pp/src/main/res/drawable/ic_delete_24.xml → app/src/main/res/drawable/ic_delete_24.xml b/...pp/src/main/res/drawable/ic_delete_24.xml → app/src/main/res/drawable/ic_delete_24.xml
diff --git a/...pp/src/main/res/drawable/ic_device_24.xml → app/src/main/res/drawable/ic_device_24.xml b/...pp/src/main/res/drawable/ic_device_24.xml → app/src/main/res/drawable/ic_device_24.xml
diff --git a/...rc/main/res/drawable/ic_encryption_24.xml → ...rc/main/res/drawable/ic_encryption_24.xml b/...rc/main/res/drawable/ic_encryption_24.xml → ...rc/main/res/drawable/ic_encryption_24.xml
diff --git a/.../main/res/drawable/ic_help_outline_24.xml → .../main/res/drawable/ic_help_outline_24.xml b/.../main/res/drawable/ic_help_outline_24.xml → .../main/res/drawable/ic_help_outline_24.xml
diff --git a/...rawable/ic_indeterminate_check_box_24.xml → ...rawable/ic_indeterminate_check_box_24.xml b/...rawable/ic_indeterminate_check_box_24.xml → ...rawable/ic_indeterminate_check_box_24.xml
diff --git a/...rawable/ic_launcher_foreground_shadow.xml → ...rawable/ic_launcher_foreground_shadow.xml b/...rawable/ic_launcher_foreground_shadow.xml → ...rawable/ic_launcher_foreground_shadow.xml
diff --git a/...src/main/res/drawable/ic_lock_info_24.xml → ...src/main/res/drawable/ic_lock_info_24.xml b/...src/main/res/drawable/ic_lock_info_24.xml → ...src/main/res/drawable/ic_lock_info_24.xml
diff --git a/...src/main/res/drawable/ic_lock_open_24.xml → ...src/main/res/drawable/ic_lock_open_24.xml b/...src/main/res/drawable/ic_lock_open_24.xml → ...src/main/res/drawable/ic_lock_open_24.xml
diff --git a/...p/src/main/res/drawable/ic_restore_24.xml → app/src/main/res/drawable/ic_restore_24.xml b/...p/src/main/res/drawable/ic_restore_24.xml → app/src/main/res/drawable/ic_restore_24.xml
diff --git a/.../src/main/res/drawable/ic_save_alt_24.xml → app/src/main/res/drawable/ic_save_alt_24.xml b/.../src/main/res/drawable/ic_save_alt_24.xml → app/src/main/res/drawable/ic_save_alt_24.xml
diff --git a/...pp/src/main/res/drawable/ic_search_24.xml → app/src/main/res/drawable/ic_search_24.xml b/...pp/src/main/res/drawable/ic_search_24.xml → app/src/main/res/drawable/ic_search_24.xml
diff --git a/.../src/main/res/drawable/ic_settings_24.xml → app/src/main/res/drawable/ic_settings_24.xml b/.../src/main/res/drawable/ic_settings_24.xml → app/src/main/res/drawable/ic_settings_24.xml
diff --git a/...pApp/src/main/res/drawable/ic_sort_24.xml → app/src/main/res/drawable/ic_sort_24.xml b/...pApp/src/main/res/drawable/ic_sort_24.xml → app/src/main/res/drawable/ic_sort_24.xml
diff --git a/.../res/drawable/privacyfriendlyappslogo.png → .../res/drawable/privacyfriendlyappslogo.png b/.../res/drawable/privacyfriendlyappslogo.png → .../res/drawable/privacyfriendlyappslogo.png
diff --git a/...in/res/drawable/secuso_logo_blau_blau.xml → ...in/res/drawable/secuso_logo_blau_blau.xml b/...in/res/drawable/secuso_logo_blau_blau.xml → ...in/res/drawable/secuso_logo_blau_blau.xml
diff --git a/...c/main/res/layout-land/fragment_about.xml → ...c/main/res/layout-land/fragment_about.xml b/...c/main/res/layout-land/fragment_about.xml → ...c/main/res/layout-land/fragment_about.xml
diff --git a/.../src/main/res/layout-w900dp/item_list.xml → app/src/main/res/layout-w900dp/item_list.xml b/.../src/main/res/layout-w900dp/item_list.xml → app/src/main/res/layout-w900dp/item_list.xml
diff --git a/...res/layout/activity_display_menu_item.xml → ...res/layout/activity_display_menu_item.xml b/...res/layout/activity_display_menu_item.xml → ...res/layout/activity_display_menu_item.xml
diff --git a/...ain/res/layout/activity_import_backup.xml → ...ain/res/layout/activity_import_backup.xml b/...ain/res/layout/activity_import_backup.xml → ...ain/res/layout/activity_import_backup.xml
diff --git a/...App/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml b/...App/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml
diff --git a/...n/res/layout/data_inspection_activity.xml → ...n/res/layout/data_inspection_activity.xml b/...n/res/layout/data_inspection_activity.xml → ...n/res/layout/data_inspection_activity.xml
diff --git a/...n/res/layout/data_inspection_fragment.xml → ...n/res/layout/data_inspection_fragment.xml b/...n/res/layout/data_inspection_fragment.xml → ...n/res/layout/data_inspection_fragment.xml
diff --git a/...p/src/main/res/layout/dialog_checkbox.xml → app/src/main/res/layout/dialog_checkbox.xml b/...p/src/main/res/layout/dialog_checkbox.xml → app/src/main/res/layout/dialog_checkbox.xml
diff --git a/...ayout/dialog_data_export_confirmation.xml → ...ayout/dialog_data_export_confirmation.xml b/...ayout/dialog_data_export_confirmation.xml → ...ayout/dialog_data_export_confirmation.xml
diff --git a/...log_data_export_confirmation_multiple.xml → ...log_data_export_confirmation_multiple.xml b/...log_data_export_confirmation_multiple.xml → ...log_data_export_confirmation_multiple.xml
diff --git a/...pp/src/main/res/layout/fragment_about.xml → app/src/main/res/layout/fragment_about.xml b/...pp/src/main/res/layout/fragment_about.xml → app/src/main/res/layout/fragment_about.xml
diff --git a/...n/res/layout/fragment_backup_overview.xml → ...n/res/layout/fragment_backup_overview.xml b/...n/res/layout/fragment_backup_overview.xml → ...n/res/layout/fragment_backup_overview.xml
diff --git a/...App/src/main/res/layout/fragment_help.xml → app/src/main/res/layout/fragment_help.xml b/...App/src/main/res/layout/fragment_help.xml → app/src/main/res/layout/fragment_help.xml
diff --git a/.../main/res/layout/item_application_job.xml → .../main/res/layout/item_application_job.xml b/.../main/res/layout/item_application_job.xml → .../main/res/layout/item_application_job.xml
diff --git a/.../main/res/layout/item_application_pfa.xml → .../main/res/layout/item_application_pfa.xml b/.../main/res/layout/item_application_pfa.xml → .../main/res/layout/item_application_pfa.xml
diff --git a/...upApp/src/main/res/layout/item_backup.xml → app/src/main/res/layout/item_backup.xml b/...upApp/src/main/res/layout/item_backup.xml → app/src/main/res/layout/item_backup.xml
diff --git a/.../main/res/layout/item_data_inspection.xml → .../main/res/layout/item_data_inspection.xml b/.../main/res/layout/item_data_inspection.xml → .../main/res/layout/item_data_inspection.xml
diff --git a/BackupApp/src/main/res/layout/item_help.xml → app/src/main/res/layout/item_help.xml b/BackupApp/src/main/res/layout/item_help.xml → app/src/main/res/layout/item_help.xml
diff --git a/...p/src/main/res/layout/item_help_group.xml → app/src/main/res/layout/item_help_group.xml b/...p/src/main/res/layout/item_help_group.xml → app/src/main/res/layout/item_help_group.xml
diff --git a/BackupApp/src/main/res/layout/item_list.xml → app/src/main/res/layout/item_list.xml b/BackupApp/src/main/res/layout/item_list.xml → app/src/main/res/layout/item_list.xml
diff --git a/...pp/src/main/res/layout/item_main_menu.xml → app/src/main/res/layout/item_main_menu.xml b/...pp/src/main/res/layout/item_main_menu.xml → app/src/main/res/layout/item_main_menu.xml
diff --git a/.../src/main/res/layout/item_placeholder.xml → app/src/main/res/layout/item_placeholder.xml b/.../src/main/res/layout/item_placeholder.xml → app/src/main/res/layout/item_placeholder.xml
diff --git a/...upApp/src/main/res/layout/search_view.xml → app/src/main/res/layout/search_view.xml b/...upApp/src/main/res/layout/search_view.xml → app/src/main/res/layout/search_view.xml
diff --git a/...rc/main/res/menu/menu_data_inspection.xml → ...rc/main/res/menu/menu_data_inspection.xml b/...rc/main/res/menu/menu_data_inspection.xml → ...rc/main/res/menu/menu_data_inspection.xml
diff --git a/...p/src/main/res/menu/menu_manage_lists.xml → app/src/main/res/menu/menu_manage_lists.xml b/...p/src/main/res/menu/menu_manage_lists.xml → app/src/main/res/menu/menu_manage_lists.xml
diff --git a/.../main/res/menu/menu_popup_application.xml → .../main/res/menu/menu_popup_application.xml b/.../main/res/menu/menu_popup_application.xml → .../main/res/menu/menu_popup_application.xml
diff --git a/...p/src/main/res/menu/menu_popup_backup.xml → app/src/main/res/menu/menu_popup_backup.xml b/...p/src/main/res/menu/menu_popup_backup.xml → app/src/main/res/menu/menu_popup_backup.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → app/src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → app/src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/BackupApp/src/main/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml b/BackupApp/src/main/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml
diff --git a/BackupApp/src/main/res/values/arrays.xml → app/src/main/res/values/arrays.xml b/BackupApp/src/main/res/values/arrays.xml → app/src/main/res/values/arrays.xml
diff --git a/BackupApp/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml b/BackupApp/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml
diff --git a/BackupApp/src/main/res/values/dimens.xml → app/src/main/res/values/dimens.xml b/BackupApp/src/main/res/values/dimens.xml → app/src/main/res/values/dimens.xml
diff --git a/BackupApp/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml b/BackupApp/src/main/res/values/strings.xml → app/src/main/res/values/strings.xml
diff --git a/BackupApp/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml b/BackupApp/src/main/res/values/styles.xml → app/src/main/res/values/styles.xml
diff --git a/...pApp/src/main/res/xml/pref_encryption.xml → app/src/main/res/xml/pref_encryption.xml b/...pApp/src/main/res/xml/pref_encryption.xml → app/src/main/res/xml/pref_encryption.xml
diff --git a/BackupApp/src/main/res/xml/pref_general.xml → app/src/main/res/xml/pref_general.xml b/BackupApp/src/main/res/xml/pref_general.xml → app/src/main/res/xml/pref_general.xml
diff --git a/.../privacyfriendlybackup/ExampleUnitTest.kt → .../privacyfriendlybackup/ExampleUnitTest.kt b/.../privacyfriendlybackup/ExampleUnitTest.kt → .../privacyfriendlybackup/ExampleUnitTest.kt
diff --git a/openpgp-api → libs/openpgp-api b/openpgp-api → libs/openpgp-api
diff --git a/BackupAPI → libs/privacy-friendly-backup-api b/BackupAPI → libs/privacy-friendly-backup-api
diff --git a/settings.gradle b/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')