From b1efc48a9ba9f06b270a6b7c7c204ff3e751a1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Wed, 4 Dec 2024 12:28:26 +0100 Subject: [PATCH 1/3] 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` --- .gitmodules | 4 ++-- {BackupApp => app}/.gitignore | 0 {BackupApp => app}/build.gradle | 0 {BackupApp => app}/lint.xml | 0 {BackupApp => app}/proguard-rules.pro | 0 .../1.json | 0 .../2.json | 0 .../org/secuso/privacyfriendlybackup/DriveTest.kt | 0 .../secuso/privacyfriendlybackup/SignatureTest.kt | 0 .../org/secuso/privacyfriendlybackup/WorkerTest.kt | 0 {BackupApp => app}/src/main/AndroidManifest.xml | 0 {BackupApp => app}/src/main/assets/Signatures.json | 0 .../privacyfriendlybackup/BackupApplication.kt | 0 .../backupapi/PfaApiConnection.kt | 0 .../data/BackupDataStorageRepository.kt | 0 .../privacyfriendlybackup/data/BackupJobManager.kt | 0 .../data/apps/PFApplicationHelper.kt | 0 .../data/cache/DecryptionCache.kt | 0 .../data/cache/DecryptionMetaData.kt | 0 .../data/cloud/WebserviceProvider.kt | 0 .../data/cloud/drive/DriveRepository.kt | 0 .../data/cloud/drive/DriveService.kt | 0 .../data/cloud/drive/GoogleDriveHelper.kt | 0 .../data/cloud/retrofit/ApiResponse.kt | 0 .../data/cloud/retrofit/LiveDataCallAdapter.kt | 0 .../cloud/retrofit/LiveDataCallAdapterFactory.kt | 0 .../data/exporter/DataExporter.kt | 0 .../data/external/ExternalBackupDataStoreHelper.kt | 0 .../data/importer/DataImporter.kt | 0 .../data/internal/InternalBackupDataStoreHelper.kt | 0 .../data/room/BackupDatabase.kt | 0 .../data/room/converters/Converters.kt | 0 .../data/room/dao/BackupJobDao.kt | 0 .../data/room/dao/BackupMetaDataDao.kt | 0 .../data/room/dao/InternalBackupDataDao.kt | 0 .../data/room/dao/PFAJobDao.kt | 0 .../data/room/model/BackupJob.kt | 0 .../data/room/model/InternalBackupData.kt | 0 .../privacyfriendlybackup/data/room/model/PFAJob.kt | 0 .../data/room/model/StoredBackupMetaData.kt | 0 .../data/room/model/enums/JobAction.kt | 0 .../data/room/model/enums/StorageType.kt | 0 .../preference/PreferenceKeys.kt | 0 .../privacyfriendlybackup/services/BackupService.kt | 0 .../ui/application/ApplicationAdapter.kt | 0 .../ui/application/ApplicationOverviewFragment.kt | 0 .../ui/application/ApplicationOverviewViewModel.kt | 0 .../ui/application/BackupJobAdapter.kt | 0 .../ui/application/GroupList.kt | 0 .../ui/backup/BackupOverviewFragment.kt | 0 .../ui/backup/BackupOverviewViewModel.kt | 0 .../ui/backup/FilterableBackupAdapter.kt | 0 .../privacyfriendlybackup/ui/common/BaseFragment.kt | 0 .../ui/common/DisplayMenuItemActivity.kt | 0 .../secuso/privacyfriendlybackup/ui/common/Mode.kt | 0 .../ui/common/PlaceholderFragment.kt | 0 .../ui/encryption/EncryptionSettingsActivity.kt | 0 .../ui/encryption/EncryptionSettingsFragment.kt | 0 .../ui/encryption/OpenPgpAppDialogFragment.kt | 0 .../ui/encryption/OpenPgpAppPreference.java | 0 .../ui/encryption/OpenPgpKeyPreference.java | 0 .../encryption/UserInteractionRequiredActivity.kt | 0 .../ui/help/ExpandableListAdapter.kt | 0 .../privacyfriendlybackup/ui/help/HelpDataDump.kt | 0 .../privacyfriendlybackup/ui/help/HelpFragment.kt | 0 .../ui/importbackup/ImportBackupActivity.kt | 0 .../ui/inspection/DataInspectionActivity.kt | 0 .../ui/inspection/DataInspectionAdapter.kt | 0 .../ui/inspection/DataInspectionFragment.kt | 0 .../ui/inspection/DataInspectionViewModel.kt | 0 .../ui/inspection/LoadStatus.kt | 0 .../privacyfriendlybackup/ui/main/AboutFragment.kt | 0 .../privacyfriendlybackup/ui/main/MainActivity.kt | 0 .../ui/settings/SettingsFragment.kt | 0 .../privacyfriendlybackup/util/BackupDataUtil.kt | 0 .../worker/BackupJobManagerWorker.kt | 0 .../worker/EncryptionWorker.kt | 0 .../privacyfriendlybackup/worker/PfaWorker.kt | 0 .../privacyfriendlybackup/worker/StoreWorker.kt | 0 .../worker/datakeys/DataKeys.kt | 0 .../src/main/res/drawable-hdpi/ic_stat_backup.png | Bin .../src/main/res/drawable-mdpi/ic_stat_backup.png | Bin .../src/main/res/drawable-xhdpi/ic_stat_backup.png | Bin .../src/main/res/drawable-xxhdpi/ic_stat_backup.png | Bin .../main/res/drawable-xxxhdpi/ic_stat_backup.png | Bin .../src/main/res/drawable/ic_about_24.xml | 0 .../src/main/res/drawable/ic_apps_24.xml | 0 .../src/main/res/drawable/ic_arrow_back_24.xml | 0 .../src/main/res/drawable/ic_backup_24.xml | 0 .../drawable/ic_baseline_add_circle_outline_24.xml | 0 .../res/drawable/ic_baseline_error_outline_24.xml | 0 .../main/res/drawable/ic_baseline_file_copy_24.xml | 0 .../res/drawable/ic_baseline_no_encryption_24.xml | 0 .../res/drawable/ic_baseline_phonelink_lock_24.xml | 0 .../main/res/drawable/ic_baseline_save_alt_24.xml | 0 .../main/res/drawable/ic_baseline_smartphone_24.xml | 0 .../src/main/res/drawable/ic_check_24.xml | 0 .../src/main/res/drawable/ic_check_box_24.xml | 0 .../res/drawable/ic_check_box_outline_blank_24.xml | 0 .../src/main/res/drawable/ic_close_24.xml | 0 .../src/main/res/drawable/ic_cloud_24.xml | 0 .../src/main/res/drawable/ic_cloud_download_24.xml | 0 .../src/main/res/drawable/ic_cloud_upload_24.xml | 0 .../src/main/res/drawable/ic_delete_24.xml | 0 .../src/main/res/drawable/ic_device_24.xml | 0 .../src/main/res/drawable/ic_encryption_24.xml | 0 .../src/main/res/drawable/ic_help_outline_24.xml | 0 .../res/drawable/ic_indeterminate_check_box_24.xml | 0 .../res/drawable/ic_launcher_foreground_shadow.xml | 0 .../src/main/res/drawable/ic_lock_info_24.xml | 0 .../src/main/res/drawable/ic_lock_open_24.xml | 0 .../src/main/res/drawable/ic_restore_24.xml | 0 .../src/main/res/drawable/ic_save_alt_24.xml | 0 .../src/main/res/drawable/ic_search_24.xml | 0 .../src/main/res/drawable/ic_settings_24.xml | 0 .../src/main/res/drawable/ic_sort_24.xml | 0 .../main/res/drawable/privacyfriendlyappslogo.png | Bin .../src/main/res/drawable/secuso_logo_blau_blau.xml | 0 .../src/main/res/layout-land/fragment_about.xml | 0 .../src/main/res/layout-w900dp/item_list.xml | 0 .../main/res/layout/activity_display_menu_item.xml | 0 .../src/main/res/layout/activity_import_backup.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../main/res/layout/data_inspection_activity.xml | 0 .../main/res/layout/data_inspection_fragment.xml | 0 .../src/main/res/layout/dialog_checkbox.xml | 0 .../res/layout/dialog_data_export_confirmation.xml | 0 .../dialog_data_export_confirmation_multiple.xml | 0 .../src/main/res/layout/fragment_about.xml | 0 .../main/res/layout/fragment_backup_overview.xml | 0 .../src/main/res/layout/fragment_help.xml | 0 .../src/main/res/layout/item_application_job.xml | 0 .../src/main/res/layout/item_application_pfa.xml | 0 .../src/main/res/layout/item_backup.xml | 0 .../src/main/res/layout/item_data_inspection.xml | 0 .../src/main/res/layout/item_help.xml | 0 .../src/main/res/layout/item_help_group.xml | 0 .../src/main/res/layout/item_list.xml | 0 .../src/main/res/layout/item_main_menu.xml | 0 .../src/main/res/layout/item_placeholder.xml | 0 .../src/main/res/layout/search_view.xml | 0 .../src/main/res/menu/menu_data_inspection.xml | 0 .../src/main/res/menu/menu_manage_lists.xml | 0 .../src/main/res/menu/menu_popup_application.xml | 0 .../src/main/res/menu/menu_popup_backup.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values-de/strings.xml | 0 {BackupApp => app}/src/main/res/values/arrays.xml | 0 {BackupApp => app}/src/main/res/values/colors.xml | 0 {BackupApp => app}/src/main/res/values/dimens.xml | 0 {BackupApp => app}/src/main/res/values/strings.xml | 0 {BackupApp => app}/src/main/res/values/styles.xml | 0 .../src/main/res/xml/pref_encryption.xml | 0 .../src/main/res/xml/pref_general.xml | 0 .../secuso/privacyfriendlybackup/ExampleUnitTest.kt | 0 openpgp-api => libs/openpgp-api | 0 BackupAPI => libs/privacy-friendly-backup-api | 0 settings.gradle | 6 +++--- 169 files changed, 5 insertions(+), 5 deletions(-) rename {BackupApp => app}/.gitignore (100%) rename {BackupApp => app}/build.gradle (100%) rename {BackupApp => app}/lint.xml (100%) rename {BackupApp => app}/proguard-rules.pro (100%) rename {BackupApp => app}/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/1.json (100%) rename {BackupApp => app}/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/2.json (100%) rename {BackupApp => app}/src/androidTest/java/org/secuso/privacyfriendlybackup/DriveTest.kt (100%) rename {BackupApp => app}/src/androidTest/java/org/secuso/privacyfriendlybackup/SignatureTest.kt (100%) rename {BackupApp => app}/src/androidTest/java/org/secuso/privacyfriendlybackup/WorkerTest.kt (100%) rename {BackupApp => app}/src/main/AndroidManifest.xml (100%) rename {BackupApp => app}/src/main/assets/Signatures.json (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/BackupApplication.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/backupapi/PfaApiConnection.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/BackupDataStorageRepository.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/BackupJobManager.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/apps/PFApplicationHelper.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionCache.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionMetaData.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/WebserviceProvider.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveRepository.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveService.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/GoogleDriveHelper.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/ApiResponse.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapterFactory.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/exporter/DataExporter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/external/ExternalBackupDataStoreHelper.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/importer/DataImporter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/internal/InternalBackupDataStoreHelper.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/BackupDatabase.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/converters/Converters.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupJobDao.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupMetaDataDao.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/InternalBackupDataDao.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/PFAJobDao.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/BackupJob.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/InternalBackupData.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/PFAJob.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/StoredBackupMetaData.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/JobAction.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/StorageType.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/preference/PreferenceKeys.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/services/BackupService.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewViewModel.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/application/BackupJobAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/application/GroupList.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewViewModel.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/FilterableBackupAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/common/BaseFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/common/DisplayMenuItemActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/common/Mode.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/common/PlaceholderFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppDialogFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppPreference.java (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpKeyPreference.java (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/UserInteractionRequiredActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/help/ExpandableListAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpDataDump.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/importbackup/ImportBackupActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionAdapter.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionViewModel.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/LoadStatus.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/main/AboutFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/main/MainActivity.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/ui/settings/SettingsFragment.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/util/BackupDataUtil.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/worker/BackupJobManagerWorker.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/worker/EncryptionWorker.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/worker/PfaWorker.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/worker/StoreWorker.kt (100%) rename {BackupApp => app}/src/main/java/org/secuso/privacyfriendlybackup/worker/datakeys/DataKeys.kt (100%) rename {BackupApp => app}/src/main/res/drawable-hdpi/ic_stat_backup.png (100%) rename {BackupApp => app}/src/main/res/drawable-mdpi/ic_stat_backup.png (100%) rename {BackupApp => app}/src/main/res/drawable-xhdpi/ic_stat_backup.png (100%) rename {BackupApp => app}/src/main/res/drawable-xxhdpi/ic_stat_backup.png (100%) rename {BackupApp => app}/src/main/res/drawable-xxxhdpi/ic_stat_backup.png (100%) rename {BackupApp => app}/src/main/res/drawable/ic_about_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_apps_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_arrow_back_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_backup_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_error_outline_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_file_copy_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_no_encryption_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_phonelink_lock_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_save_alt_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_baseline_smartphone_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_check_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_check_box_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_check_box_outline_blank_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_close_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_cloud_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_cloud_download_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_cloud_upload_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_delete_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_device_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_encryption_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_help_outline_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_indeterminate_check_box_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_launcher_foreground_shadow.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_lock_info_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_lock_open_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_restore_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_save_alt_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_search_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_settings_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/ic_sort_24.xml (100%) rename {BackupApp => app}/src/main/res/drawable/privacyfriendlyappslogo.png (100%) rename {BackupApp => app}/src/main/res/drawable/secuso_logo_blau_blau.xml (100%) rename {BackupApp => app}/src/main/res/layout-land/fragment_about.xml (100%) rename {BackupApp => app}/src/main/res/layout-w900dp/item_list.xml (100%) rename {BackupApp => app}/src/main/res/layout/activity_display_menu_item.xml (100%) rename {BackupApp => app}/src/main/res/layout/activity_import_backup.xml (100%) rename {BackupApp => app}/src/main/res/layout/activity_main.xml (100%) rename {BackupApp => app}/src/main/res/layout/data_inspection_activity.xml (100%) rename {BackupApp => app}/src/main/res/layout/data_inspection_fragment.xml (100%) rename {BackupApp => app}/src/main/res/layout/dialog_checkbox.xml (100%) rename {BackupApp => app}/src/main/res/layout/dialog_data_export_confirmation.xml (100%) rename {BackupApp => app}/src/main/res/layout/dialog_data_export_confirmation_multiple.xml (100%) rename {BackupApp => app}/src/main/res/layout/fragment_about.xml (100%) rename {BackupApp => app}/src/main/res/layout/fragment_backup_overview.xml (100%) rename {BackupApp => app}/src/main/res/layout/fragment_help.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_application_job.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_application_pfa.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_backup.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_data_inspection.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_help.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_help_group.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_list.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_main_menu.xml (100%) rename {BackupApp => app}/src/main/res/layout/item_placeholder.xml (100%) rename {BackupApp => app}/src/main/res/layout/search_view.xml (100%) rename {BackupApp => app}/src/main/res/menu/menu_data_inspection.xml (100%) rename {BackupApp => app}/src/main/res/menu/menu_manage_lists.xml (100%) rename {BackupApp => app}/src/main/res/menu/menu_popup_application.xml (100%) rename {BackupApp => app}/src/main/res/menu/menu_popup_backup.xml (100%) rename {BackupApp => app}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {BackupApp => app}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {BackupApp => app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {BackupApp => app}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {BackupApp => app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {BackupApp => app}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {BackupApp => app}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {BackupApp => app}/src/main/res/values-de/strings.xml (100%) rename {BackupApp => app}/src/main/res/values/arrays.xml (100%) rename {BackupApp => app}/src/main/res/values/colors.xml (100%) rename {BackupApp => app}/src/main/res/values/dimens.xml (100%) rename {BackupApp => app}/src/main/res/values/strings.xml (100%) rename {BackupApp => app}/src/main/res/values/styles.xml (100%) rename {BackupApp => app}/src/main/res/xml/pref_encryption.xml (100%) rename {BackupApp => app}/src/main/res/xml/pref_general.xml (100%) rename {BackupApp => app}/src/test/java/org/secuso/privacyfriendlybackup/ExampleUnitTest.kt (100%) rename openpgp-api => libs/openpgp-api (100%) rename BackupAPI => libs/privacy-friendly-backup-api (100%) diff --git a/.gitmodules b/.gitmodules index cdb3b42..9c01eda 100644 --- 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 b/app/.gitignore similarity index 100% rename from BackupApp/.gitignore rename to app/.gitignore diff --git a/BackupApp/build.gradle b/app/build.gradle similarity index 100% rename from BackupApp/build.gradle rename to app/build.gradle diff --git a/BackupApp/lint.xml b/app/lint.xml similarity index 100% rename from BackupApp/lint.xml rename to app/lint.xml diff --git a/BackupApp/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from BackupApp/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/BackupApp/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/1.json b/app/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/1.json similarity index 100% rename from BackupApp/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/1.json rename to app/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/1.json diff --git a/BackupApp/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/2.json b/app/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/2.json similarity index 100% rename from BackupApp/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/2.json rename to app/schemas/org.secuso.privacyfriendlybackup.data.room.BackupDatabase/2.json diff --git a/BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/DriveTest.kt b/app/src/androidTest/java/org/secuso/privacyfriendlybackup/DriveTest.kt similarity index 100% rename from BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/DriveTest.kt rename to app/src/androidTest/java/org/secuso/privacyfriendlybackup/DriveTest.kt diff --git a/BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/SignatureTest.kt b/app/src/androidTest/java/org/secuso/privacyfriendlybackup/SignatureTest.kt similarity index 100% rename from BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/SignatureTest.kt rename to app/src/androidTest/java/org/secuso/privacyfriendlybackup/SignatureTest.kt diff --git a/BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/WorkerTest.kt b/app/src/androidTest/java/org/secuso/privacyfriendlybackup/WorkerTest.kt similarity index 100% rename from BackupApp/src/androidTest/java/org/secuso/privacyfriendlybackup/WorkerTest.kt rename to app/src/androidTest/java/org/secuso/privacyfriendlybackup/WorkerTest.kt diff --git a/BackupApp/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from BackupApp/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/BackupApp/src/main/assets/Signatures.json b/app/src/main/assets/Signatures.json similarity index 100% rename from BackupApp/src/main/assets/Signatures.json rename to app/src/main/assets/Signatures.json diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/BackupApplication.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/BackupApplication.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/BackupApplication.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/BackupApplication.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/backupapi/PfaApiConnection.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/backupapi/PfaApiConnection.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/backupapi/PfaApiConnection.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/backupapi/PfaApiConnection.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/BackupDataStorageRepository.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/BackupDataStorageRepository.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/BackupDataStorageRepository.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/BackupDataStorageRepository.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/BackupJobManager.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/BackupJobManager.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/BackupJobManager.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/BackupJobManager.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/apps/PFApplicationHelper.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/apps/PFApplicationHelper.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/apps/PFApplicationHelper.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/apps/PFApplicationHelper.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionCache.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionCache.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionCache.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionCache.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionMetaData.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionMetaData.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionMetaData.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cache/DecryptionMetaData.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/WebserviceProvider.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/WebserviceProvider.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/WebserviceProvider.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/WebserviceProvider.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveRepository.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveRepository.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveRepository.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveRepository.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveService.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveService.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveService.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/DriveService.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/GoogleDriveHelper.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/GoogleDriveHelper.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/GoogleDriveHelper.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/drive/GoogleDriveHelper.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/ApiResponse.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/ApiResponse.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/ApiResponse.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/ApiResponse.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapterFactory.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapterFactory.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapterFactory.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/cloud/retrofit/LiveDataCallAdapterFactory.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/exporter/DataExporter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/exporter/DataExporter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/exporter/DataExporter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/exporter/DataExporter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/external/ExternalBackupDataStoreHelper.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/external/ExternalBackupDataStoreHelper.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/external/ExternalBackupDataStoreHelper.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/external/ExternalBackupDataStoreHelper.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/importer/DataImporter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/importer/DataImporter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/importer/DataImporter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/importer/DataImporter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/internal/InternalBackupDataStoreHelper.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/internal/InternalBackupDataStoreHelper.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/internal/InternalBackupDataStoreHelper.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/internal/InternalBackupDataStoreHelper.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/BackupDatabase.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/BackupDatabase.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/BackupDatabase.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/BackupDatabase.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/converters/Converters.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/converters/Converters.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/converters/Converters.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/converters/Converters.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupJobDao.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupJobDao.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupJobDao.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupJobDao.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupMetaDataDao.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupMetaDataDao.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupMetaDataDao.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/BackupMetaDataDao.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/InternalBackupDataDao.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/InternalBackupDataDao.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/InternalBackupDataDao.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/InternalBackupDataDao.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/PFAJobDao.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/PFAJobDao.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/PFAJobDao.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/dao/PFAJobDao.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/BackupJob.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/BackupJob.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/BackupJob.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/BackupJob.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/InternalBackupData.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/InternalBackupData.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/InternalBackupData.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/InternalBackupData.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/PFAJob.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/PFAJob.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/PFAJob.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/PFAJob.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/StoredBackupMetaData.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/StoredBackupMetaData.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/StoredBackupMetaData.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/StoredBackupMetaData.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/JobAction.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/JobAction.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/JobAction.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/JobAction.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/StorageType.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/StorageType.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/StorageType.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/data/room/model/enums/StorageType.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/preference/PreferenceKeys.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/preference/PreferenceKeys.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/preference/PreferenceKeys.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/preference/PreferenceKeys.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/services/BackupService.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/services/BackupService.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/services/BackupService.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/services/BackupService.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewViewModel.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewViewModel.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewViewModel.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/ApplicationOverviewViewModel.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/BackupJobAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/BackupJobAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/BackupJobAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/BackupJobAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/GroupList.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/GroupList.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/application/GroupList.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/application/GroupList.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewViewModel.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewViewModel.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewViewModel.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/BackupOverviewViewModel.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/FilterableBackupAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/FilterableBackupAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/FilterableBackupAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/backup/FilterableBackupAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/BaseFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/BaseFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/BaseFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/BaseFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/DisplayMenuItemActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/DisplayMenuItemActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/DisplayMenuItemActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/DisplayMenuItemActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/Mode.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/Mode.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/Mode.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/Mode.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/PlaceholderFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/PlaceholderFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/common/PlaceholderFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/common/PlaceholderFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/EncryptionSettingsFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppDialogFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppDialogFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppDialogFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppDialogFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppPreference.java b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppPreference.java similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppPreference.java rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpAppPreference.java diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpKeyPreference.java b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpKeyPreference.java similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpKeyPreference.java rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/OpenPgpKeyPreference.java diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/UserInteractionRequiredActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/UserInteractionRequiredActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/UserInteractionRequiredActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/encryption/UserInteractionRequiredActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/ExpandableListAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/ExpandableListAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/ExpandableListAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/ExpandableListAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpDataDump.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpDataDump.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpDataDump.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpDataDump.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/help/HelpFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/importbackup/ImportBackupActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/importbackup/ImportBackupActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/importbackup/ImportBackupActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/importbackup/ImportBackupActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionAdapter.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionAdapter.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionAdapter.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionViewModel.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionViewModel.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionViewModel.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/DataInspectionViewModel.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/LoadStatus.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/LoadStatus.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/LoadStatus.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/inspection/LoadStatus.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/main/AboutFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/main/AboutFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/main/AboutFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/main/AboutFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/main/MainActivity.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/main/MainActivity.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/main/MainActivity.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/main/MainActivity.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/settings/SettingsFragment.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/ui/settings/SettingsFragment.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/ui/settings/SettingsFragment.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/ui/settings/SettingsFragment.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/util/BackupDataUtil.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/util/BackupDataUtil.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/util/BackupDataUtil.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/util/BackupDataUtil.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/BackupJobManagerWorker.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/worker/BackupJobManagerWorker.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/BackupJobManagerWorker.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/worker/BackupJobManagerWorker.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/EncryptionWorker.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/worker/EncryptionWorker.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/EncryptionWorker.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/worker/EncryptionWorker.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/PfaWorker.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/worker/PfaWorker.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/PfaWorker.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/worker/PfaWorker.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/StoreWorker.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/worker/StoreWorker.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/StoreWorker.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/worker/StoreWorker.kt diff --git a/BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/datakeys/DataKeys.kt b/app/src/main/java/org/secuso/privacyfriendlybackup/worker/datakeys/DataKeys.kt similarity index 100% rename from BackupApp/src/main/java/org/secuso/privacyfriendlybackup/worker/datakeys/DataKeys.kt rename to app/src/main/java/org/secuso/privacyfriendlybackup/worker/datakeys/DataKeys.kt diff --git a/BackupApp/src/main/res/drawable-hdpi/ic_stat_backup.png b/app/src/main/res/drawable-hdpi/ic_stat_backup.png similarity index 100% rename from BackupApp/src/main/res/drawable-hdpi/ic_stat_backup.png rename to app/src/main/res/drawable-hdpi/ic_stat_backup.png diff --git a/BackupApp/src/main/res/drawable-mdpi/ic_stat_backup.png b/app/src/main/res/drawable-mdpi/ic_stat_backup.png similarity index 100% rename from BackupApp/src/main/res/drawable-mdpi/ic_stat_backup.png rename to app/src/main/res/drawable-mdpi/ic_stat_backup.png diff --git a/BackupApp/src/main/res/drawable-xhdpi/ic_stat_backup.png b/app/src/main/res/drawable-xhdpi/ic_stat_backup.png similarity index 100% rename from BackupApp/src/main/res/drawable-xhdpi/ic_stat_backup.png rename to app/src/main/res/drawable-xhdpi/ic_stat_backup.png diff --git a/BackupApp/src/main/res/drawable-xxhdpi/ic_stat_backup.png b/app/src/main/res/drawable-xxhdpi/ic_stat_backup.png similarity index 100% rename from BackupApp/src/main/res/drawable-xxhdpi/ic_stat_backup.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_backup.png diff --git a/BackupApp/src/main/res/drawable-xxxhdpi/ic_stat_backup.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_backup.png similarity index 100% rename from BackupApp/src/main/res/drawable-xxxhdpi/ic_stat_backup.png rename to app/src/main/res/drawable-xxxhdpi/ic_stat_backup.png diff --git a/BackupApp/src/main/res/drawable/ic_about_24.xml b/app/src/main/res/drawable/ic_about_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_about_24.xml rename to app/src/main/res/drawable/ic_about_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_apps_24.xml b/app/src/main/res/drawable/ic_apps_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_apps_24.xml rename to app/src/main/res/drawable/ic_apps_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_arrow_back_24.xml b/app/src/main/res/drawable/ic_arrow_back_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_arrow_back_24.xml rename to app/src/main/res/drawable/ic_arrow_back_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_backup_24.xml b/app/src/main/res/drawable/ic_backup_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_backup_24.xml rename to app/src/main/res/drawable/ic_backup_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml b/app/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml rename to app/src/main/res/drawable/ic_baseline_add_circle_outline_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_error_outline_24.xml b/app/src/main/res/drawable/ic_baseline_error_outline_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_error_outline_24.xml rename to app/src/main/res/drawable/ic_baseline_error_outline_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_file_copy_24.xml b/app/src/main/res/drawable/ic_baseline_file_copy_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_file_copy_24.xml rename to app/src/main/res/drawable/ic_baseline_file_copy_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_no_encryption_24.xml b/app/src/main/res/drawable/ic_baseline_no_encryption_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_no_encryption_24.xml rename to app/src/main/res/drawable/ic_baseline_no_encryption_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_phonelink_lock_24.xml b/app/src/main/res/drawable/ic_baseline_phonelink_lock_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_phonelink_lock_24.xml rename to app/src/main/res/drawable/ic_baseline_phonelink_lock_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_save_alt_24.xml b/app/src/main/res/drawable/ic_baseline_save_alt_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_save_alt_24.xml rename to app/src/main/res/drawable/ic_baseline_save_alt_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_baseline_smartphone_24.xml b/app/src/main/res/drawable/ic_baseline_smartphone_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_baseline_smartphone_24.xml rename to app/src/main/res/drawable/ic_baseline_smartphone_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_check_24.xml rename to app/src/main/res/drawable/ic_check_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_check_box_24.xml b/app/src/main/res/drawable/ic_check_box_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_check_box_24.xml rename to app/src/main/res/drawable/ic_check_box_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_check_box_outline_blank_24.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_check_box_outline_blank_24.xml rename to app/src/main/res/drawable/ic_check_box_outline_blank_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_close_24.xml b/app/src/main/res/drawable/ic_close_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_close_24.xml rename to app/src/main/res/drawable/ic_close_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_cloud_24.xml b/app/src/main/res/drawable/ic_cloud_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_cloud_24.xml rename to app/src/main/res/drawable/ic_cloud_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_cloud_download_24.xml b/app/src/main/res/drawable/ic_cloud_download_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_cloud_download_24.xml rename to app/src/main/res/drawable/ic_cloud_download_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_cloud_upload_24.xml b/app/src/main/res/drawable/ic_cloud_upload_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_cloud_upload_24.xml rename to app/src/main/res/drawable/ic_cloud_upload_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_delete_24.xml b/app/src/main/res/drawable/ic_delete_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_delete_24.xml rename to app/src/main/res/drawable/ic_delete_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_device_24.xml b/app/src/main/res/drawable/ic_device_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_device_24.xml rename to app/src/main/res/drawable/ic_device_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_encryption_24.xml b/app/src/main/res/drawable/ic_encryption_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_encryption_24.xml rename to app/src/main/res/drawable/ic_encryption_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_help_outline_24.xml b/app/src/main/res/drawable/ic_help_outline_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_help_outline_24.xml rename to app/src/main/res/drawable/ic_help_outline_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_indeterminate_check_box_24.xml b/app/src/main/res/drawable/ic_indeterminate_check_box_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_indeterminate_check_box_24.xml rename to app/src/main/res/drawable/ic_indeterminate_check_box_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_launcher_foreground_shadow.xml b/app/src/main/res/drawable/ic_launcher_foreground_shadow.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_launcher_foreground_shadow.xml rename to app/src/main/res/drawable/ic_launcher_foreground_shadow.xml diff --git a/BackupApp/src/main/res/drawable/ic_lock_info_24.xml b/app/src/main/res/drawable/ic_lock_info_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_lock_info_24.xml rename to app/src/main/res/drawable/ic_lock_info_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_lock_open_24.xml b/app/src/main/res/drawable/ic_lock_open_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_lock_open_24.xml rename to app/src/main/res/drawable/ic_lock_open_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_restore_24.xml b/app/src/main/res/drawable/ic_restore_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_restore_24.xml rename to app/src/main/res/drawable/ic_restore_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_save_alt_24.xml b/app/src/main/res/drawable/ic_save_alt_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_save_alt_24.xml rename to app/src/main/res/drawable/ic_save_alt_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_search_24.xml b/app/src/main/res/drawable/ic_search_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_search_24.xml rename to app/src/main/res/drawable/ic_search_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_settings_24.xml b/app/src/main/res/drawable/ic_settings_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_settings_24.xml rename to app/src/main/res/drawable/ic_settings_24.xml diff --git a/BackupApp/src/main/res/drawable/ic_sort_24.xml b/app/src/main/res/drawable/ic_sort_24.xml similarity index 100% rename from BackupApp/src/main/res/drawable/ic_sort_24.xml rename to app/src/main/res/drawable/ic_sort_24.xml diff --git a/BackupApp/src/main/res/drawable/privacyfriendlyappslogo.png b/app/src/main/res/drawable/privacyfriendlyappslogo.png similarity index 100% rename from BackupApp/src/main/res/drawable/privacyfriendlyappslogo.png rename to app/src/main/res/drawable/privacyfriendlyappslogo.png diff --git a/BackupApp/src/main/res/drawable/secuso_logo_blau_blau.xml b/app/src/main/res/drawable/secuso_logo_blau_blau.xml similarity index 100% rename from BackupApp/src/main/res/drawable/secuso_logo_blau_blau.xml rename to app/src/main/res/drawable/secuso_logo_blau_blau.xml diff --git a/BackupApp/src/main/res/layout-land/fragment_about.xml b/app/src/main/res/layout-land/fragment_about.xml similarity index 100% rename from BackupApp/src/main/res/layout-land/fragment_about.xml rename to app/src/main/res/layout-land/fragment_about.xml diff --git a/BackupApp/src/main/res/layout-w900dp/item_list.xml b/app/src/main/res/layout-w900dp/item_list.xml similarity index 100% rename from BackupApp/src/main/res/layout-w900dp/item_list.xml rename to app/src/main/res/layout-w900dp/item_list.xml diff --git a/BackupApp/src/main/res/layout/activity_display_menu_item.xml b/app/src/main/res/layout/activity_display_menu_item.xml similarity index 100% rename from BackupApp/src/main/res/layout/activity_display_menu_item.xml rename to app/src/main/res/layout/activity_display_menu_item.xml diff --git a/BackupApp/src/main/res/layout/activity_import_backup.xml b/app/src/main/res/layout/activity_import_backup.xml similarity index 100% rename from BackupApp/src/main/res/layout/activity_import_backup.xml rename to app/src/main/res/layout/activity_import_backup.xml diff --git a/BackupApp/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from BackupApp/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/BackupApp/src/main/res/layout/data_inspection_activity.xml b/app/src/main/res/layout/data_inspection_activity.xml similarity index 100% rename from BackupApp/src/main/res/layout/data_inspection_activity.xml rename to app/src/main/res/layout/data_inspection_activity.xml diff --git a/BackupApp/src/main/res/layout/data_inspection_fragment.xml b/app/src/main/res/layout/data_inspection_fragment.xml similarity index 100% rename from BackupApp/src/main/res/layout/data_inspection_fragment.xml rename to app/src/main/res/layout/data_inspection_fragment.xml diff --git a/BackupApp/src/main/res/layout/dialog_checkbox.xml b/app/src/main/res/layout/dialog_checkbox.xml similarity index 100% rename from BackupApp/src/main/res/layout/dialog_checkbox.xml rename to app/src/main/res/layout/dialog_checkbox.xml diff --git a/BackupApp/src/main/res/layout/dialog_data_export_confirmation.xml b/app/src/main/res/layout/dialog_data_export_confirmation.xml similarity index 100% rename from BackupApp/src/main/res/layout/dialog_data_export_confirmation.xml rename to app/src/main/res/layout/dialog_data_export_confirmation.xml diff --git a/BackupApp/src/main/res/layout/dialog_data_export_confirmation_multiple.xml b/app/src/main/res/layout/dialog_data_export_confirmation_multiple.xml similarity index 100% rename from BackupApp/src/main/res/layout/dialog_data_export_confirmation_multiple.xml rename to app/src/main/res/layout/dialog_data_export_confirmation_multiple.xml diff --git a/BackupApp/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml similarity index 100% rename from BackupApp/src/main/res/layout/fragment_about.xml rename to app/src/main/res/layout/fragment_about.xml diff --git a/BackupApp/src/main/res/layout/fragment_backup_overview.xml b/app/src/main/res/layout/fragment_backup_overview.xml similarity index 100% rename from BackupApp/src/main/res/layout/fragment_backup_overview.xml rename to app/src/main/res/layout/fragment_backup_overview.xml diff --git a/BackupApp/src/main/res/layout/fragment_help.xml b/app/src/main/res/layout/fragment_help.xml similarity index 100% rename from BackupApp/src/main/res/layout/fragment_help.xml rename to app/src/main/res/layout/fragment_help.xml diff --git a/BackupApp/src/main/res/layout/item_application_job.xml b/app/src/main/res/layout/item_application_job.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_application_job.xml rename to app/src/main/res/layout/item_application_job.xml diff --git a/BackupApp/src/main/res/layout/item_application_pfa.xml b/app/src/main/res/layout/item_application_pfa.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_application_pfa.xml rename to app/src/main/res/layout/item_application_pfa.xml diff --git a/BackupApp/src/main/res/layout/item_backup.xml b/app/src/main/res/layout/item_backup.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_backup.xml rename to app/src/main/res/layout/item_backup.xml diff --git a/BackupApp/src/main/res/layout/item_data_inspection.xml b/app/src/main/res/layout/item_data_inspection.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_data_inspection.xml rename to app/src/main/res/layout/item_data_inspection.xml diff --git a/BackupApp/src/main/res/layout/item_help.xml b/app/src/main/res/layout/item_help.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_help.xml rename to app/src/main/res/layout/item_help.xml diff --git a/BackupApp/src/main/res/layout/item_help_group.xml b/app/src/main/res/layout/item_help_group.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_help_group.xml rename to app/src/main/res/layout/item_help_group.xml diff --git a/BackupApp/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_list.xml rename to app/src/main/res/layout/item_list.xml diff --git a/BackupApp/src/main/res/layout/item_main_menu.xml b/app/src/main/res/layout/item_main_menu.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_main_menu.xml rename to app/src/main/res/layout/item_main_menu.xml diff --git a/BackupApp/src/main/res/layout/item_placeholder.xml b/app/src/main/res/layout/item_placeholder.xml similarity index 100% rename from BackupApp/src/main/res/layout/item_placeholder.xml rename to app/src/main/res/layout/item_placeholder.xml diff --git a/BackupApp/src/main/res/layout/search_view.xml b/app/src/main/res/layout/search_view.xml similarity index 100% rename from BackupApp/src/main/res/layout/search_view.xml rename to app/src/main/res/layout/search_view.xml diff --git a/BackupApp/src/main/res/menu/menu_data_inspection.xml b/app/src/main/res/menu/menu_data_inspection.xml similarity index 100% rename from BackupApp/src/main/res/menu/menu_data_inspection.xml rename to app/src/main/res/menu/menu_data_inspection.xml diff --git a/BackupApp/src/main/res/menu/menu_manage_lists.xml b/app/src/main/res/menu/menu_manage_lists.xml similarity index 100% rename from BackupApp/src/main/res/menu/menu_manage_lists.xml rename to app/src/main/res/menu/menu_manage_lists.xml diff --git a/BackupApp/src/main/res/menu/menu_popup_application.xml b/app/src/main/res/menu/menu_popup_application.xml similarity index 100% rename from BackupApp/src/main/res/menu/menu_popup_application.xml rename to app/src/main/res/menu/menu_popup_application.xml diff --git a/BackupApp/src/main/res/menu/menu_popup_backup.xml b/app/src/main/res/menu/menu_popup_backup.xml similarity index 100% rename from BackupApp/src/main/res/menu/menu_popup_backup.xml rename to app/src/main/res/menu/menu_popup_backup.xml diff --git a/BackupApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from BackupApp/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/BackupApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from BackupApp/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/BackupApp/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from BackupApp/src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/BackupApp/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from BackupApp/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/BackupApp/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from BackupApp/src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/BackupApp/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from BackupApp/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/BackupApp/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/BackupApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/BackupApp/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/BackupApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/BackupApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/BackupApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from BackupApp/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/BackupApp/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from BackupApp/src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/BackupApp/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from BackupApp/src/main/res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/BackupApp/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from BackupApp/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/BackupApp/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from BackupApp/src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/BackupApp/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from BackupApp/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/BackupApp/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from BackupApp/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/BackupApp/src/main/res/xml/pref_encryption.xml b/app/src/main/res/xml/pref_encryption.xml similarity index 100% rename from BackupApp/src/main/res/xml/pref_encryption.xml rename to app/src/main/res/xml/pref_encryption.xml diff --git a/BackupApp/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml similarity index 100% rename from BackupApp/src/main/res/xml/pref_general.xml rename to app/src/main/res/xml/pref_general.xml diff --git a/BackupApp/src/test/java/org/secuso/privacyfriendlybackup/ExampleUnitTest.kt b/app/src/test/java/org/secuso/privacyfriendlybackup/ExampleUnitTest.kt similarity index 100% rename from BackupApp/src/test/java/org/secuso/privacyfriendlybackup/ExampleUnitTest.kt rename to app/src/test/java/org/secuso/privacyfriendlybackup/ExampleUnitTest.kt diff --git a/openpgp-api b/libs/openpgp-api similarity index 100% rename from openpgp-api rename to libs/openpgp-api diff --git a/BackupAPI b/libs/privacy-friendly-backup-api similarity index 100% rename from BackupAPI rename to libs/privacy-friendly-backup-api diff --git a/settings.gradle b/settings.gradle index 4650b51..3f7aa20 100644 --- 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') \ No newline at end of file +project(':openpgp-api').projectDir = new File('libs/openpgp-api/openpgp-api') \ No newline at end of file From c8f3444fd5bab774a13cc7dd276dfcddb62dc3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Wed, 4 Dec 2024 12:29:28 +0100 Subject: [PATCH 2/3] Update `.gitignore` --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e9d0871..c6abec2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,4 @@ Thumbs.db *.apk /pfa.properties /.idea/ -/BackupApp/release +/app/release From 82db0cea2b76122866c2ed7c3bf89331170c1b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20L=C3=A4nge?= Date: Wed, 4 Dec 2024 12:30:48 +0100 Subject: [PATCH 3/3] Update workflows --- .github/workflows/android-test.yml | 13 +++++++------ .github/workflows/ci.yml | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml index efd1db7..e499e2f 100644 --- a/.github/workflows/android-test.yml +++ b/.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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1426ba..fe5b0a9 100644 --- a/.github/workflows/ci.yml +++ b/.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 \ No newline at end of file + path: app/build/outputs/apk/debug/*.apk \ No newline at end of file