From 32f558faf19afbda85704f0f5f971fcd4947c9d7 Mon Sep 17 00:00:00 2001 From: Steve Soltys Date: Mon, 28 Oct 2019 21:57:47 -0400 Subject: [PATCH] Rebrand application as 'Seedvault' --- .travis.yml | 2 +- Android.mk | 6 +-- CHANGELOG.md | 4 +- README.md | 8 ++-- .../CipherUniqueNonceTest.kt | 6 +-- .../DocumentsStorageTest.kt | 6 +-- app/src/main/AndroidManifest.xml | 4 +- .../{backup => seedvault}/Backup.kt | 8 ++-- .../{backup => seedvault}/BackupMonitor.kt | 2 +- .../BackupNotificationManager.kt | 4 +- .../{backup => seedvault}/Base64Utils.kt | 2 +- .../NotificationBackupObserver.kt | 2 +- .../UsbIntentReceiver.kt | 8 ++-- .../crypto/CipherFactory.kt | 2 +- .../{backup => seedvault}/crypto/Crypto.kt | 4 +- .../crypto/KeyManager.kt | 4 +- .../{backup => seedvault}/header/Header.kt | 2 +- .../header/HeaderReader.kt | 4 +- .../header/HeaderWriter.kt | 4 +- .../metadata/Metadata.kt | 4 +- .../metadata/MetadataReader.kt | 10 ++--- .../metadata/MetadataWriter.kt | 6 +-- .../restore/RestoreActivity.kt | 8 ++-- .../restore/RestoreProgressFragment.kt | 10 ++--- .../restore/RestoreSetAdapter.kt | 6 +-- .../restore/RestoreSetFragment.kt | 4 +- .../restore/RestoreViewModel.kt | 12 +++--- .../settings/BackupManagerSettings.kt | 2 +- .../settings/SettingsActivity.kt | 10 ++--- .../settings/SettingsFragment.kt | 12 +++--- .../settings/SettingsManager.kt | 2 +- .../settings/SettingsViewModel.kt | 6 +-- .../transport/ConfigurableBackupTransport.kt | 6 +-- .../ConfigurableBackupTransportService.kt | 10 ++--- .../transport/PackageService.kt | 8 ++-- .../transport/PluginManager.kt | 38 +++++++++---------- .../transport/backup/BackupCoordinator.kt | 10 ++--- .../transport/backup/BackupPlugin.kt | 2 +- .../transport/backup/FullBackup.kt | 8 ++-- .../transport/backup/FullBackupPlugin.kt | 2 +- .../transport/backup/InputFactory.kt | 2 +- .../transport/backup/KVBackup.kt | 10 ++--- .../transport/backup/KVBackupPlugin.kt | 2 +- .../plugins/DocumentsProviderBackupPlugin.kt | 8 ++-- .../plugins/DocumentsProviderFullBackup.kt | 6 +-- .../plugins/DocumentsProviderKVBackup.kt | 6 +-- .../backup/plugins/DocumentsStorage.kt | 6 +-- .../transport/restore/FullRestore.kt | 8 ++-- .../transport/restore/FullRestorePlugin.kt | 2 +- .../transport/restore/KVRestore.kt | 10 ++--- .../transport/restore/KVRestorePlugin.kt | 2 +- .../transport/restore/OutputFactory.kt | 2 +- .../transport/restore/RestoreCoordinator.kt | 10 ++--- .../transport/restore/RestorePlugin.kt | 4 +- .../DocumentsProviderFullRestorePlugin.kt | 6 +-- .../DocumentsProviderKVRestorePlugin.kt | 8 ++-- .../plugins/DocumentsProviderRestorePlugin.kt | 16 ++++---- .../ui/BackupActivity.kt | 4 +- .../{backup => seedvault}/ui/LiveEvent.kt | 4 +- .../ui/LiveEventHandler.java | 2 +- .../ui/MutableLiveEvent.kt | 2 +- .../ui/RequireProvisioningActivity.kt | 8 ++-- .../ui/RequireProvisioningViewModel.kt | 6 +-- .../ui/recoverycode/RecoveryCodeActivity.kt | 12 +++--- .../ui/recoverycode/RecoveryCodeAdapter.kt | 4 +- .../recoverycode/RecoveryCodeInputFragment.kt | 6 +-- .../RecoveryCodeOutputFragment.kt | 4 +- .../ui/recoverycode/RecoveryCodeViewModel.kt | 8 ++-- .../ui/storage/BackupStorageViewModel.kt | 10 ++--- .../ui/storage/PermissionGrantActivity.kt | 2 +- .../ui/storage/RestoreStorageViewModel.kt | 8 ++-- .../ui/storage/StorageActivity.kt | 12 +++--- .../ui/storage/StorageCheckFragment.kt | 4 +- .../ui/storage/StorageRootAdapter.kt | 6 +-- .../ui/storage/StorageRootFetcher.kt | 4 +- .../ui/storage/StorageRootsFragment.kt | 8 ++-- .../ui/storage/StorageViewModel.kt | 20 +++++----- app/src/main/res/values/strings.xml | 2 +- .../{backup => seedvault}/TestUtils.kt | 2 +- .../crypto/KeyManagerTestImpl.kt | 2 +- .../crypto/CryptoImplTest.kt | 10 ++--- .../crypto/CryptoIntegrationTest.kt | 6 +-- .../crypto/CryptoTest.kt | 10 ++--- .../crypto/WordListTest.kt | 2 +- .../header/HeaderReaderTest.kt | 8 ++-- .../header/HeaderWriterReaderTest.kt | 6 +-- .../metadata/MetadataReaderTest.kt | 8 ++-- .../metadata/MetadataWriterDecoderTest.kt | 6 +-- .../transport/CoordinatorIntegrationTest.kt | 24 ++++++------ .../transport/TransportTest.kt | 6 +-- .../transport/backup/BackupCoordinatorTest.kt | 10 ++--- .../transport/backup/BackupTest.kt | 8 ++-- .../transport/backup/FullBackupTest.kt | 2 +- .../transport/backup/KVBackupTest.kt | 10 ++--- .../transport/restore/FullRestoreTest.kt | 10 ++--- .../transport/restore/KVRestoreTest.kt | 12 +++--- .../restore/RestoreCoordinatorTest.kt | 12 +++--- .../transport/restore/RestoreTest.kt | 10 ++--- deploy-prebuilt.sh | 8 ++-- ... permissions_com.stevesoltys.seedvault.xml | 2 +- ...=> whitelist_com.stevesoltys.seedvault.xml | 2 +- 101 files changed, 339 insertions(+), 339 deletions(-) rename app/src/androidTest/java/com/stevesoltys/{backup => seedvault}/CipherUniqueNonceTest.kt (83%) rename app/src/androidTest/java/com/stevesoltys/{backup => seedvault}/DocumentsStorageTest.kt (92%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/Backup.kt (81%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/BackupMonitor.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/BackupNotificationManager.kt (97%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/Base64Utils.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/NotificationBackupObserver.kt (98%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/UsbIntentReceiver.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/crypto/CipherFactory.kt (95%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/crypto/Crypto.kt (98%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/crypto/KeyManager.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/header/Header.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/header/HeaderReader.kt (97%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/header/HeaderWriter.kt (95%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/metadata/Metadata.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/metadata/MetadataReader.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/metadata/MetadataWriter.kt (88%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/restore/RestoreActivity.kt (85%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/restore/RestoreProgressFragment.kt (93%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/restore/RestoreSetAdapter.kt (89%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/restore/RestoreSetFragment.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/restore/RestoreViewModel.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/settings/BackupManagerSettings.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/settings/SettingsActivity.kt (82%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/settings/SettingsFragment.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/settings/SettingsManager.kt (99%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/settings/SettingsViewModel.kt (58%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/ConfigurableBackupTransport.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/ConfigurableBackupTransportService.kt (89%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/PackageService.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/PluginManager.kt (59%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/BackupCoordinator.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/BackupPlugin.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/FullBackup.kt (97%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/FullBackupPlugin.kt (90%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/InputFactory.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/KVBackup.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/KVBackupPlugin.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/plugins/DocumentsProviderBackupPlugin.kt (85%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/plugins/DocumentsProviderFullBackup.kt (83%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/plugins/DocumentsProviderKVBackup.kt (90%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/backup/plugins/DocumentsStorage.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/FullRestore.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/FullRestorePlugin.kt (89%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/KVRestore.kt (95%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/KVRestorePlugin.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/OutputFactory.kt (92%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/RestoreCoordinator.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/RestorePlugin.kt (77%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt (81%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt (83%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/transport/restore/plugins/DocumentsProviderRestorePlugin.kt (81%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/BackupActivity.kt (93%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/LiveEvent.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/LiveEventHandler.java (63%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/MutableLiveEvent.kt (85%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/RequireProvisioningActivity.kt (90%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/RequireProvisioningViewModel.kt (81%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/recoverycode/RecoveryCodeActivity.kt (87%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/recoverycode/RecoveryCodeAdapter.kt (92%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/recoverycode/RecoveryCodeInputFragment.kt (96%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/recoverycode/RecoveryCodeOutputFragment.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/recoverycode/RecoveryCodeViewModel.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/BackupStorageViewModel.kt (89%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/PermissionGrantActivity.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/RestoreStorageViewModel.kt (86%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageActivity.kt (91%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageCheckFragment.kt (95%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageRootAdapter.kt (95%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageRootFetcher.kt (98%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageRootsFragment.kt (94%) rename app/src/main/java/com/stevesoltys/{backup => seedvault}/ui/storage/StorageViewModel.kt (90%) rename app/src/sharedTest/java/com/stevesoltys/{backup => seedvault}/TestUtils.kt (96%) rename app/src/sharedTest/java/com/stevesoltys/{backup => seedvault}/crypto/KeyManagerTestImpl.kt (92%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/crypto/CryptoImplTest.kt (87%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/crypto/CryptoIntegrationTest.kt (89%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/crypto/CryptoTest.kt (97%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/crypto/WordListTest.kt (99%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/header/HeaderReaderTest.kt (98%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/header/HeaderWriterReaderTest.kt (96%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/metadata/MetadataReaderTest.kt (92%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/metadata/MetadataWriterDecoderTest.kt (86%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/CoordinatorIntegrationTest.kt (92%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/TransportTest.kt (87%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/backup/BackupCoordinatorTest.kt (95%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/backup/BackupTest.kt (72%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/backup/FullBackupTest.kt (99%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/backup/KVBackupTest.kt (96%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/restore/FullRestoreTest.kt (95%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/restore/KVRestoreTest.kt (96%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/restore/RestoreCoordinatorTest.kt (95%) rename app/src/test/java/com/stevesoltys/{backup => seedvault}/transport/restore/RestoreTest.kt (68%) rename permissions_com.stevesoltys.backup.xml => permissions_com.stevesoltys.seedvault.xml (77%) rename whitelist_com.stevesoltys.backup.xml => whitelist_com.stevesoltys.seedvault.xml (52%) diff --git a/.travis.yml b/.travis.yml index a3718d2f..d8719b9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,6 @@ deploy: script: ./deploy-prebuilt.sh skip_cleanup: true on: - repo: stevesoltys/backup + repo: stevesoltys/seedvault all_branches: true condition: $TRAVIS_BRANCH =~ ^(master|develop)$ diff --git a/Android.mk b/Android.mk index 52e02880..2f8bfeaa 100644 --- a/Android.mk +++ b/Android.mk @@ -1,7 +1,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := permissions_com.stevesoltys.backup.xml +LOCAL_MODULE := permissions_com.stevesoltys.seedvault.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions @@ -9,7 +9,7 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := whitelist_com.stevesoltys.backup.xml +LOCAL_MODULE := whitelist_com.stevesoltys.seedvault.xml LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/sysconfig @@ -23,5 +23,5 @@ LOCAL_CERTIFICATE := platform LOCAL_MODULE_CLASS := APPS LOCAL_PRIVILEGED_MODULE := true LOCAL_DEX_PREOPT := false -LOCAL_REQUIRED_MODULES := permissions_com.stevesoltys.backup.xml whitelist_com.stevesoltys.backup.xml +LOCAL_REQUIRED_MODULES := permissions_com.stevesoltys.seedvault.xml whitelist_com.stevesoltys.seedvault.xml include $(BUILD_PREBUILT) diff --git a/CHANGELOG.md b/CHANGELOG.md index c85b1e0d..f1232894 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ ## [0.1.2] - 2019-02-11 ### Fixed -- Downgrade SDK target version to 26 due to [#15](https://github.com/stevesoltys/backup/issues/15). +- Downgrade SDK target version to 26 due to [#15](https://github.com/stevesoltys/seedvault/issues/15). ## [0.1.1] - 2019-02-11 ### Added @@ -20,4 +20,4 @@ - Upgrade target SDK version to 28. ### Fixed -- Ignore `com.android.providers.downloads.ui` to resolve [#14](https://github.com/stevesoltys/backup/issues/14). +- Ignore `com.android.providers.downloads.ui` to resolve [#14](https://github.com/stevesoltys/seedvault/issues/14). diff --git a/README.md b/README.md index 4129ce8b..35b92e83 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Backup -[![Build Status](https://travis-ci.com/stevesoltys/backup.svg?branch=master)](https://travis-ci.com/stevesoltys/backup) +# Seedvault +[![Build Status](https://travis-ci.com/stevesoltys/seedvault.svg?branch=master)](https://travis-ci.com/stevesoltys/seedvault) A backup application for the [Android Open Source Project](https://source.android.com/). @@ -9,7 +9,7 @@ A backup application for the [Android Open Source Project](https://source.androi - Password-based encryption. ## Getting Started -- Check out [the wiki](https://github.com/stevesoltys/backup/wiki) for information on building the application with +- Check out [the wiki](https://github.com/stevesoltys/seedvault/wiki) for information on building the application with AOSP. ## What makes this different? @@ -17,7 +17,7 @@ This application is compiled with the operating system and does not require a ro internal APIs as `adb backup` and only requires the permission `android.permission.BACKUP` for this. ## Contributing -Bug reports and pull requests are welcome on GitHub at https://github.com/stevesoltys/backup. +Bug reports and pull requests are welcome on GitHub at https://github.com/stevesoltys/seedvault. ## Permissions diff --git a/app/src/androidTest/java/com/stevesoltys/backup/CipherUniqueNonceTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt similarity index 83% rename from app/src/androidTest/java/com/stevesoltys/backup/CipherUniqueNonceTest.kt rename to app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt index f2ccaba0..e902b8e6 100644 --- a/app/src/androidTest/java/com/stevesoltys/backup/CipherUniqueNonceTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/CipherUniqueNonceTest.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.util.Log import androidx.test.filters.LargeTest import androidx.test.runner.AndroidJUnit4 -import com.stevesoltys.backup.crypto.CipherFactoryImpl -import com.stevesoltys.backup.crypto.KeyManagerTestImpl +import com.stevesoltys.seedvault.crypto.CipherFactoryImpl +import com.stevesoltys.seedvault.crypto.KeyManagerTestImpl import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/com/stevesoltys/backup/DocumentsStorageTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/DocumentsStorageTest.kt similarity index 92% rename from app/src/androidTest/java/com/stevesoltys/backup/DocumentsStorageTest.kt rename to app/src/androidTest/java/com/stevesoltys/seedvault/DocumentsStorageTest.kt index 6d8034e1..588bbe42 100644 --- a/app/src/androidTest/java/com/stevesoltys/backup/DocumentsStorageTest.kt +++ b/app/src/androidTest/java/com/stevesoltys/seedvault/DocumentsStorageTest.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import androidx.documentfile.provider.DocumentFile import androidx.test.platform.app.InstrumentationRegistry import androidx.test.runner.AndroidJUnit4 -import com.stevesoltys.backup.transport.backup.plugins.DocumentsStorage -import com.stevesoltys.backup.transport.backup.plugins.createOrGetFile +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsStorage +import com.stevesoltys.seedvault.transport.backup.plugins.createOrGetFile import org.junit.After import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertNotNull diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 875a3e55..c2a7187c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -58,7 +58,7 @@ android:label="@string/restore_title" android:theme="@style/AppTheme.NoActionBar"> - + diff --git a/app/src/main/java/com/stevesoltys/backup/Backup.kt b/app/src/main/java/com/stevesoltys/seedvault/Backup.kt similarity index 81% rename from app/src/main/java/com/stevesoltys/backup/Backup.kt rename to app/src/main/java/com/stevesoltys/seedvault/Backup.kt index 1494c9c8..b238bdfa 100644 --- a/app/src/main/java/com/stevesoltys/backup/Backup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/Backup.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.app.Application import android.app.backup.BackupManager.PACKAGE_MANAGER_SENTINEL @@ -6,9 +6,9 @@ import android.app.backup.IBackupManager import android.content.Context.BACKUP_SERVICE import android.os.Build import android.os.ServiceManager.getService -import com.stevesoltys.backup.crypto.KeyManager -import com.stevesoltys.backup.crypto.KeyManagerImpl -import com.stevesoltys.backup.settings.SettingsManager +import com.stevesoltys.seedvault.crypto.KeyManager +import com.stevesoltys.seedvault.crypto.KeyManagerImpl +import com.stevesoltys.seedvault.settings.SettingsManager /** * @author Steve Soltys diff --git a/app/src/main/java/com/stevesoltys/backup/BackupMonitor.kt b/app/src/main/java/com/stevesoltys/seedvault/BackupMonitor.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/BackupMonitor.kt rename to app/src/main/java/com/stevesoltys/seedvault/BackupMonitor.kt index 2e7724ee..0049fcef 100644 --- a/app/src/main/java/com/stevesoltys/backup/BackupMonitor.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/BackupMonitor.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.app.backup.BackupManagerMonitor.* import android.app.backup.IBackupManagerMonitor diff --git a/app/src/main/java/com/stevesoltys/backup/BackupNotificationManager.kt b/app/src/main/java/com/stevesoltys/seedvault/BackupNotificationManager.kt similarity index 97% rename from app/src/main/java/com/stevesoltys/backup/BackupNotificationManager.kt rename to app/src/main/java/com/stevesoltys/seedvault/BackupNotificationManager.kt index d8df735a..a19b8267 100644 --- a/app/src/main/java/com/stevesoltys/backup/BackupNotificationManager.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/BackupNotificationManager.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.app.NotificationChannel import android.app.NotificationManager @@ -9,7 +9,7 @@ import android.app.backup.BackupTransport.TRANSPORT_PACKAGE_REJECTED import android.content.Context import android.content.Intent import androidx.core.app.NotificationCompat.* -import com.stevesoltys.backup.settings.SettingsActivity +import com.stevesoltys.seedvault.settings.SettingsActivity private const val CHANNEL_ID_OBSERVER = "NotificationBackupObserver" private const val CHANNEL_ID_ERROR = "NotificationError" diff --git a/app/src/main/java/com/stevesoltys/backup/Base64Utils.kt b/app/src/main/java/com/stevesoltys/seedvault/Base64Utils.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/Base64Utils.kt rename to app/src/main/java/com/stevesoltys/seedvault/Base64Utils.kt index 637849f6..b0ae1ef5 100644 --- a/app/src/main/java/com/stevesoltys/backup/Base64Utils.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/Base64Utils.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import java.nio.charset.Charset import java.util.* diff --git a/app/src/main/java/com/stevesoltys/backup/NotificationBackupObserver.kt b/app/src/main/java/com/stevesoltys/seedvault/NotificationBackupObserver.kt similarity index 98% rename from app/src/main/java/com/stevesoltys/backup/NotificationBackupObserver.kt rename to app/src/main/java/com/stevesoltys/seedvault/NotificationBackupObserver.kt index 2d264023..9806f558 100644 --- a/app/src/main/java/com/stevesoltys/backup/NotificationBackupObserver.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/NotificationBackupObserver.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.app.backup.BackupProgress import android.app.backup.IBackupObserver diff --git a/app/src/main/java/com/stevesoltys/backup/UsbIntentReceiver.kt b/app/src/main/java/com/stevesoltys/seedvault/UsbIntentReceiver.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/UsbIntentReceiver.kt rename to app/src/main/java/com/stevesoltys/seedvault/UsbIntentReceiver.kt index b4daca68..9bdb3529 100644 --- a/app/src/main/java/com/stevesoltys/backup/UsbIntentReceiver.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/UsbIntentReceiver.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import android.content.BroadcastReceiver import android.content.Context @@ -11,9 +11,9 @@ import android.net.Uri import android.os.Handler import android.provider.DocumentsContract import android.util.Log -import com.stevesoltys.backup.settings.FlashDrive -import com.stevesoltys.backup.transport.requestBackup -import com.stevesoltys.backup.ui.storage.AUTHORITY_STORAGE +import com.stevesoltys.seedvault.settings.FlashDrive +import com.stevesoltys.seedvault.transport.requestBackup +import com.stevesoltys.seedvault.ui.storage.AUTHORITY_STORAGE import java.util.* import java.util.concurrent.TimeUnit.HOURS diff --git a/app/src/main/java/com/stevesoltys/backup/crypto/CipherFactory.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/CipherFactory.kt similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/crypto/CipherFactory.kt rename to app/src/main/java/com/stevesoltys/seedvault/crypto/CipherFactory.kt index 22bf719d..833bdf36 100644 --- a/app/src/main/java/com/stevesoltys/backup/crypto/CipherFactory.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/crypto/CipherFactory.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto import javax.crypto.Cipher import javax.crypto.Cipher.DECRYPT_MODE diff --git a/app/src/main/java/com/stevesoltys/backup/crypto/Crypto.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt similarity index 98% rename from app/src/main/java/com/stevesoltys/backup/crypto/Crypto.kt rename to app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt index 7d615b2a..d859e91d 100644 --- a/app/src/main/java/com/stevesoltys/backup/crypto/Crypto.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt @@ -1,6 +1,6 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto -import com.stevesoltys.backup.header.* +import com.stevesoltys.seedvault.header.* import java.io.EOFException import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/com/stevesoltys/backup/crypto/KeyManager.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/crypto/KeyManager.kt rename to app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt index 793e34d2..92264116 100644 --- a/app/src/main/java/com/stevesoltys/backup/crypto/KeyManager.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto import android.os.Build.VERSION.SDK_INT import android.security.keystore.KeyProperties.* @@ -10,7 +10,7 @@ import javax.crypto.spec.SecretKeySpec internal const val KEY_SIZE = 256 private const val KEY_SIZE_BYTES = KEY_SIZE / 8 -private const val KEY_ALIAS = "com.stevesoltys.backup" +private const val KEY_ALIAS = "com.stevesoltys.seedvault" private const val ANDROID_KEY_STORE = "AndroidKeyStore" interface KeyManager { diff --git a/app/src/main/java/com/stevesoltys/backup/header/Header.kt b/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/header/Header.kt rename to app/src/main/java/com/stevesoltys/seedvault/header/Header.kt index f8a31e89..864acd03 100644 --- a/app/src/main/java/com/stevesoltys/backup/header/Header.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.header +package com.stevesoltys.seedvault.header internal const val VERSION: Byte = 0 internal const val MAX_PACKAGE_LENGTH_SIZE = 255 diff --git a/app/src/main/java/com/stevesoltys/backup/header/HeaderReader.kt b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt similarity index 97% rename from app/src/main/java/com/stevesoltys/backup/header/HeaderReader.kt rename to app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt index 8e198ceb..f9ef3900 100644 --- a/app/src/main/java/com/stevesoltys/backup/header/HeaderReader.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt @@ -1,6 +1,6 @@ -package com.stevesoltys.backup.header +package com.stevesoltys.seedvault.header -import com.stevesoltys.backup.Utf8 +import com.stevesoltys.seedvault.Utf8 import java.io.EOFException import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/com/stevesoltys/backup/header/HeaderWriter.kt b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderWriter.kt similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/header/HeaderWriter.kt rename to app/src/main/java/com/stevesoltys/seedvault/header/HeaderWriter.kt index 1598b266..65066374 100644 --- a/app/src/main/java/com/stevesoltys/backup/header/HeaderWriter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderWriter.kt @@ -1,6 +1,6 @@ -package com.stevesoltys.backup.header +package com.stevesoltys.seedvault.header -import com.stevesoltys.backup.Utf8 +import com.stevesoltys.seedvault.Utf8 import java.io.IOException import java.io.OutputStream import java.nio.ByteBuffer diff --git a/app/src/main/java/com/stevesoltys/backup/metadata/Metadata.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/metadata/Metadata.kt rename to app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt index 9cea9ff9..54322224 100644 --- a/app/src/main/java/com/stevesoltys/backup/metadata/Metadata.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.metadata +package com.stevesoltys.seedvault.metadata import android.os.Build import android.os.Build.VERSION.SDK_INT -import com.stevesoltys.backup.header.VERSION +import com.stevesoltys.seedvault.header.VERSION import java.io.InputStream data class BackupMetadata( diff --git a/app/src/main/java/com/stevesoltys/backup/metadata/MetadataReader.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/metadata/MetadataReader.kt rename to app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt index 33d0dc4b..e39249be 100644 --- a/app/src/main/java/com/stevesoltys/backup/metadata/MetadataReader.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.metadata +package com.stevesoltys.seedvault.metadata import androidx.annotation.VisibleForTesting -import com.stevesoltys.backup.Utf8 -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.header.UnsupportedVersionException -import com.stevesoltys.backup.header.VERSION +import com.stevesoltys.seedvault.Utf8 +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.header.UnsupportedVersionException +import com.stevesoltys.seedvault.header.VERSION import org.json.JSONException import org.json.JSONObject import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/metadata/MetadataWriter.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataWriter.kt similarity index 88% rename from app/src/main/java/com/stevesoltys/backup/metadata/MetadataWriter.kt rename to app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataWriter.kt index 2aa1f36b..4a01c61c 100644 --- a/app/src/main/java/com/stevesoltys/backup/metadata/MetadataWriter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataWriter.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.metadata +package com.stevesoltys.seedvault.metadata import androidx.annotation.VisibleForTesting -import com.stevesoltys.backup.Utf8 -import com.stevesoltys.backup.crypto.Crypto +import com.stevesoltys.seedvault.Utf8 +import com.stevesoltys.seedvault.crypto.Crypto import org.json.JSONObject import java.io.IOException import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/restore/RestoreActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt similarity index 85% rename from app/src/main/java/com/stevesoltys/backup/restore/RestoreActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt index 00f58cae..5b1b67c6 100644 --- a/app/src/main/java/com/stevesoltys/backup/restore/RestoreActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt @@ -1,12 +1,12 @@ -package com.stevesoltys.backup.restore +package com.stevesoltys.seedvault.restore import android.os.Bundle import androidx.annotation.CallSuper import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.RequireProvisioningActivity -import com.stevesoltys.backup.ui.RequireProvisioningViewModel +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.RequireProvisioningActivity +import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel class RestoreActivity : RequireProvisioningActivity() { diff --git a/app/src/main/java/com/stevesoltys/backup/restore/RestoreProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt similarity index 93% rename from app/src/main/java/com/stevesoltys/backup/restore/RestoreProgressFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt index e5805087..71e5d894 100644 --- a/app/src/main/java/com/stevesoltys/backup/restore/RestoreProgressFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.restore +package com.stevesoltys.seedvault.restore import android.app.Activity.RESULT_OK import android.os.Bundle @@ -11,10 +11,10 @@ import android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.getAppName -import com.stevesoltys.backup.isDebugBuild +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.getAppName +import com.stevesoltys.seedvault.isDebugBuild import kotlinx.android.synthetic.main.fragment_restore_progress.* class RestoreProgressFragment : Fragment() { diff --git a/app/src/main/java/com/stevesoltys/backup/restore/RestoreSetAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt similarity index 89% rename from app/src/main/java/com/stevesoltys/backup/restore/RestoreSetAdapter.kt rename to app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt index d6acf602..35d96628 100644 --- a/app/src/main/java/com/stevesoltys/backup/restore/RestoreSetAdapter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.restore +package com.stevesoltys.seedvault.restore import android.app.backup.RestoreSet import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView.Adapter import androidx.recyclerview.widget.RecyclerView.ViewHolder -import com.stevesoltys.backup.R -import com.stevesoltys.backup.restore.RestoreSetAdapter.RestoreSetViewHolder +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.restore.RestoreSetAdapter.RestoreSetViewHolder internal class RestoreSetAdapter( private val listener: RestoreSetClickListener, diff --git a/app/src/main/java/com/stevesoltys/backup/restore/RestoreSetFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/restore/RestoreSetFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt index 39611868..6f15c2c9 100644 --- a/app/src/main/java/com/stevesoltys/backup/restore/RestoreSetFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.restore +package com.stevesoltys.seedvault.restore import android.app.backup.RestoreSet import android.os.Bundle @@ -10,7 +10,7 @@ import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R import kotlinx.android.synthetic.main.fragment_restore_set.* class RestoreSetFragment : Fragment() { diff --git a/app/src/main/java/com/stevesoltys/backup/restore/RestoreViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/restore/RestoreViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt index 3ff92c70..3549aa63 100644 --- a/app/src/main/java/com/stevesoltys/backup/restore/RestoreViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.restore +package com.stevesoltys.seedvault.restore import android.app.Application import android.app.backup.IRestoreObserver @@ -9,11 +9,11 @@ import android.util.Log import androidx.annotation.WorkerThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.BackupMonitor -import com.stevesoltys.backup.transport.TRANSPORT_ID -import com.stevesoltys.backup.ui.RequireProvisioningViewModel +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.BackupMonitor +import com.stevesoltys.seedvault.transport.TRANSPORT_ID +import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel private val TAG = RestoreViewModel::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/settings/BackupManagerSettings.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/BackupManagerSettings.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/settings/BackupManagerSettings.kt rename to app/src/main/java/com/stevesoltys/seedvault/settings/BackupManagerSettings.kt index e89f7e0a..7deac73f 100644 --- a/app/src/main/java/com/stevesoltys/backup/settings/BackupManagerSettings.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/BackupManagerSettings.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.settings +package com.stevesoltys.seedvault.settings import android.content.ContentResolver import android.provider.Settings diff --git a/app/src/main/java/com/stevesoltys/backup/settings/SettingsActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt similarity index 82% rename from app/src/main/java/com/stevesoltys/backup/settings/SettingsActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt index b9b0756e..fa95640a 100644 --- a/app/src/main/java/com/stevesoltys/backup/settings/SettingsActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt @@ -1,12 +1,12 @@ -package com.stevesoltys.backup.settings +package com.stevesoltys.seedvault.settings import android.os.Bundle import androidx.annotation.CallSuper import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.RequireProvisioningActivity -import com.stevesoltys.backup.ui.RequireProvisioningViewModel +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.RequireProvisioningActivity +import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel class SettingsActivity : RequireProvisioningActivity() { diff --git a/app/src/main/java/com/stevesoltys/backup/settings/SettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/settings/SettingsFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt index af525c52..b3dcd79b 100644 --- a/app/src/main/java/com/stevesoltys/backup/settings/SettingsFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.settings +package com.stevesoltys.seedvault.settings import android.content.Context import android.content.Context.BACKUP_SERVICE @@ -22,11 +22,11 @@ import androidx.preference.Preference import androidx.preference.Preference.OnPreferenceChangeListener import androidx.preference.PreferenceFragmentCompat import androidx.preference.TwoStatePreference -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.UsbMonitor -import com.stevesoltys.backup.isMassStorage -import com.stevesoltys.backup.restore.RestoreActivity +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.UsbMonitor +import com.stevesoltys.seedvault.isMassStorage +import com.stevesoltys.seedvault.restore.RestoreActivity import java.util.* private val TAG = SettingsFragment::class.java.name diff --git a/app/src/main/java/com/stevesoltys/backup/settings/SettingsManager.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt similarity index 99% rename from app/src/main/java/com/stevesoltys/backup/settings/SettingsManager.kt rename to app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt index eadf7d28..a1f2d7a7 100644 --- a/app/src/main/java/com/stevesoltys/backup/settings/SettingsManager.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.settings +package com.stevesoltys.seedvault.settings import android.content.Context import android.hardware.usb.UsbDevice diff --git a/app/src/main/java/com/stevesoltys/backup/settings/SettingsViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt similarity index 58% rename from app/src/main/java/com/stevesoltys/backup/settings/SettingsViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt index 465ae946..3d1788fb 100644 --- a/app/src/main/java/com/stevesoltys/backup/settings/SettingsViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.settings +package com.stevesoltys.seedvault.settings import android.app.Application -import com.stevesoltys.backup.transport.requestBackup -import com.stevesoltys.backup.ui.RequireProvisioningViewModel +import com.stevesoltys.seedvault.transport.requestBackup +import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel class SettingsViewModel(app: Application) : RequireProvisioningViewModel(app) { diff --git a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransport.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransport.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt index da9f211b..2f11fd0a 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransport.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.app.backup.BackupAgent.FLAG_CLIENT_SIDE_ENCRYPTION_ENABLED import android.app.backup.BackupTransport @@ -9,11 +9,11 @@ import android.content.Intent import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.settings.SettingsActivity +import com.stevesoltys.seedvault.settings.SettingsActivity val TRANSPORT_ID: String = ConfigurableBackupTransport::class.java.name -private const val TRANSPORT_DIRECTORY_NAME = "com.stevesoltys.backup.transport.ConfigurableBackupTransport" +private const val TRANSPORT_DIRECTORY_NAME = "com.stevesoltys.seedvault.transport.ConfigurableBackupTransport" private val TAG = ConfigurableBackupTransport::class.java.simpleName /** diff --git a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransportService.kt similarity index 89% rename from app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransportService.kt index 0ed9f921..c6b8ec52 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/ConfigurableBackupTransportService.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransportService.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.app.Service import android.app.backup.BackupManager @@ -11,10 +11,10 @@ import android.os.IBinder import android.os.RemoteException import android.util.Log import androidx.annotation.WorkerThread -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.NotificationBackupObserver -import com.stevesoltys.backup.R -import com.stevesoltys.backup.BackupMonitor +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.NotificationBackupObserver +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.BackupMonitor private val TAG = ConfigurableBackupTransportService::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/transport/PackageService.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/PackageService.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/transport/PackageService.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/PackageService.kt index 4acdd4ab..c6853b0e 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/PackageService.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/PackageService.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.content.pm.IPackageManager import android.content.pm.PackageInfo @@ -7,8 +7,8 @@ import android.os.ServiceManager.getService import android.os.UserHandle import android.util.Log import com.google.android.collect.Sets.newArraySet -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.MAGIC_PACKAGE_MANAGER +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER import java.util.* private val TAG = PackageService::class.java.simpleName @@ -20,7 +20,7 @@ private val IGNORED_PACKAGES = newArraySet( "com.android.providers.media", "com.android.providers.calendar", "com.android.providers.contacts", - "com.stevesoltys.backup" + "com.stevesoltys.seedvault" ) /** diff --git a/app/src/main/java/com/stevesoltys/backup/transport/PluginManager.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/PluginManager.kt similarity index 59% rename from app/src/main/java/com/stevesoltys/backup/transport/PluginManager.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/PluginManager.kt index 9056cb6e..7be8a57e 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/PluginManager.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/PluginManager.kt @@ -1,24 +1,24 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.content.Context -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.crypto.CipherFactoryImpl -import com.stevesoltys.backup.crypto.CryptoImpl -import com.stevesoltys.backup.header.HeaderReaderImpl -import com.stevesoltys.backup.header.HeaderWriterImpl -import com.stevesoltys.backup.metadata.MetadataReaderImpl -import com.stevesoltys.backup.metadata.MetadataWriterImpl -import com.stevesoltys.backup.transport.backup.BackupCoordinator -import com.stevesoltys.backup.transport.backup.FullBackup -import com.stevesoltys.backup.transport.backup.InputFactory -import com.stevesoltys.backup.transport.backup.KVBackup -import com.stevesoltys.backup.transport.backup.plugins.DocumentsProviderBackupPlugin -import com.stevesoltys.backup.transport.backup.plugins.DocumentsStorage -import com.stevesoltys.backup.transport.restore.FullRestore -import com.stevesoltys.backup.transport.restore.KVRestore -import com.stevesoltys.backup.transport.restore.OutputFactory -import com.stevesoltys.backup.transport.restore.RestoreCoordinator -import com.stevesoltys.backup.transport.restore.plugins.DocumentsProviderRestorePlugin +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.crypto.CipherFactoryImpl +import com.stevesoltys.seedvault.crypto.CryptoImpl +import com.stevesoltys.seedvault.header.HeaderReaderImpl +import com.stevesoltys.seedvault.header.HeaderWriterImpl +import com.stevesoltys.seedvault.metadata.MetadataReaderImpl +import com.stevesoltys.seedvault.metadata.MetadataWriterImpl +import com.stevesoltys.seedvault.transport.backup.BackupCoordinator +import com.stevesoltys.seedvault.transport.backup.FullBackup +import com.stevesoltys.seedvault.transport.backup.InputFactory +import com.stevesoltys.seedvault.transport.backup.KVBackup +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsProviderBackupPlugin +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsStorage +import com.stevesoltys.seedvault.transport.restore.FullRestore +import com.stevesoltys.seedvault.transport.restore.KVRestore +import com.stevesoltys.seedvault.transport.restore.OutputFactory +import com.stevesoltys.seedvault.transport.restore.RestoreCoordinator +import com.stevesoltys.seedvault.transport.restore.plugins.DocumentsProviderRestorePlugin class PluginManager(context: Context) { diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/BackupCoordinator.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/BackupCoordinator.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt index d693caee..857bf0ee 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/BackupCoordinator.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt @@ -1,14 +1,14 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupTransport.* import android.content.Context import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.BackupNotificationManager -import com.stevesoltys.backup.MAGIC_PACKAGE_MANAGER -import com.stevesoltys.backup.metadata.MetadataWriter -import com.stevesoltys.backup.settings.SettingsManager +import com.stevesoltys.seedvault.BackupNotificationManager +import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER +import com.stevesoltys.seedvault.metadata.MetadataWriter +import com.stevesoltys.seedvault.settings.SettingsManager import java.io.IOException import java.util.concurrent.TimeUnit.DAYS diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/BackupPlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupPlugin.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/BackupPlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupPlugin.kt index ae9b8ce4..fe53dca7 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/BackupPlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupPlugin.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import java.io.IOException import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt similarity index 97% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackup.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt index 37639176..63a5960c 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt @@ -1,12 +1,12 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupTransport.* import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.header.HeaderWriter -import com.stevesoltys.backup.header.VersionHeader +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.header.HeaderWriter +import com.stevesoltys.seedvault.header.VersionHeader import libcore.io.IoUtils.closeQuietly import org.apache.commons.io.IOUtils import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackupPlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackupPlugin.kt similarity index 90% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackupPlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackupPlugin.kt index 0e0ee772..e4dc6538 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/FullBackupPlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackupPlugin.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.content.pm.PackageInfo import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/InputFactory.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/InputFactory.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/InputFactory.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/InputFactory.kt index 78db8dbb..836265fd 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/InputFactory.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/InputFactory.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupDataInput import android.os.ParcelFileDescriptor diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackup.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt index 7e3de67a..dd020784 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt @@ -1,13 +1,13 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupTransport.* import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.encodeBase64 -import com.stevesoltys.backup.header.HeaderWriter -import com.stevesoltys.backup.header.VersionHeader +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.encodeBase64 +import com.stevesoltys.seedvault.header.HeaderWriter +import com.stevesoltys.seedvault.header.VersionHeader import libcore.io.IoUtils.closeQuietly import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackupPlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackupPlugin.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackupPlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackupPlugin.kt index 0fe1c0e7..fb6fa64d 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/KVBackupPlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackupPlugin.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.content.pm.PackageInfo import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderBackupPlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderBackupPlugin.kt similarity index 85% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderBackupPlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderBackupPlugin.kt index 49033ac7..21ba83b2 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderBackupPlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderBackupPlugin.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.transport.backup.plugins +package com.stevesoltys.seedvault.transport.backup.plugins import android.content.pm.PackageManager -import com.stevesoltys.backup.transport.backup.BackupPlugin -import com.stevesoltys.backup.transport.backup.FullBackupPlugin -import com.stevesoltys.backup.transport.backup.KVBackupPlugin +import com.stevesoltys.seedvault.transport.backup.BackupPlugin +import com.stevesoltys.seedvault.transport.backup.FullBackupPlugin +import com.stevesoltys.seedvault.transport.backup.KVBackupPlugin import java.io.IOException import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderFullBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderFullBackup.kt similarity index 83% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderFullBackup.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderFullBackup.kt index 04790d7c..c6524148 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderFullBackup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderFullBackup.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.transport.backup.plugins +package com.stevesoltys.seedvault.transport.backup.plugins import android.content.pm.PackageInfo import android.util.Log -import com.stevesoltys.backup.transport.backup.DEFAULT_QUOTA_FULL_BACKUP -import com.stevesoltys.backup.transport.backup.FullBackupPlugin +import com.stevesoltys.seedvault.transport.backup.DEFAULT_QUOTA_FULL_BACKUP +import com.stevesoltys.seedvault.transport.backup.FullBackupPlugin import java.io.IOException import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderKVBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderKVBackup.kt similarity index 90% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderKVBackup.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderKVBackup.kt index bee48a21..650077bb 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsProviderKVBackup.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsProviderKVBackup.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.transport.backup.plugins +package com.stevesoltys.seedvault.transport.backup.plugins import android.content.pm.PackageInfo import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.transport.backup.DEFAULT_QUOTA_KEY_VALUE_BACKUP -import com.stevesoltys.backup.transport.backup.KVBackupPlugin +import com.stevesoltys.seedvault.transport.backup.DEFAULT_QUOTA_KEY_VALUE_BACKUP +import com.stevesoltys.seedvault.transport.backup.KVBackupPlugin import java.io.IOException import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsStorage.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsStorage.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsStorage.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsStorage.kt index e4a80f1a..41d9d548 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/backup/plugins/DocumentsStorage.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/plugins/DocumentsStorage.kt @@ -1,11 +1,11 @@ -package com.stevesoltys.backup.transport.backup.plugins +package com.stevesoltys.seedvault.transport.backup.plugins import android.content.Context import android.content.pm.PackageInfo import android.util.Log import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.settings.SettingsManager -import com.stevesoltys.backup.settings.Storage +import com.stevesoltys.seedvault.settings.SettingsManager +import com.stevesoltys.seedvault.settings.Storage import java.io.IOException import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestore.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestore.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt index 66588567..17905fed 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestore.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt @@ -1,12 +1,12 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupTransport.* import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.header.HeaderReader -import com.stevesoltys.backup.header.UnsupportedVersionException +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.header.HeaderReader +import com.stevesoltys.seedvault.header.UnsupportedVersionException import libcore.io.IoUtils.closeQuietly import java.io.EOFException import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestorePlugin.kt similarity index 89% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestorePlugin.kt index 9281d76c..4fff7efd 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/FullRestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestorePlugin.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.content.pm.PackageInfo import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestore.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestore.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt index 6ce3de67..0ea2b611 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestore.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupDataOutput import android.app.backup.BackupTransport.TRANSPORT_ERROR @@ -6,10 +6,10 @@ import android.app.backup.BackupTransport.TRANSPORT_OK import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.decodeBase64 -import com.stevesoltys.backup.header.HeaderReader -import com.stevesoltys.backup.header.UnsupportedVersionException +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.decodeBase64 +import com.stevesoltys.seedvault.header.HeaderReader +import com.stevesoltys.seedvault.header.UnsupportedVersionException import libcore.io.IoUtils.closeQuietly import java.io.IOException import java.util.* diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestorePlugin.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestorePlugin.kt index e425752c..84b9d9e0 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/KVRestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestorePlugin.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.content.pm.PackageInfo import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/OutputFactory.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/OutputFactory.kt similarity index 92% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/OutputFactory.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/OutputFactory.kt index 16162bb6..bdd0d212 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/OutputFactory.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/OutputFactory.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupDataOutput import android.os.ParcelFileDescriptor diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/RestoreCoordinator.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/RestoreCoordinator.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt index 4cca2cdd..3812e588 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/RestoreCoordinator.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupTransport.TRANSPORT_ERROR import android.app.backup.BackupTransport.TRANSPORT_OK @@ -8,10 +8,10 @@ import android.app.backup.RestoreSet import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor import android.util.Log -import com.stevesoltys.backup.header.UnsupportedVersionException -import com.stevesoltys.backup.metadata.DecryptionFailedException -import com.stevesoltys.backup.metadata.MetadataReader -import com.stevesoltys.backup.settings.SettingsManager +import com.stevesoltys.seedvault.header.UnsupportedVersionException +import com.stevesoltys.seedvault.metadata.DecryptionFailedException +import com.stevesoltys.seedvault.metadata.MetadataReader +import com.stevesoltys.seedvault.settings.SettingsManager import libcore.io.IoUtils.closeQuietly import java.io.IOException diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/RestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorePlugin.kt similarity index 77% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/RestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorePlugin.kt index 53094e07..f0e494eb 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/RestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorePlugin.kt @@ -1,6 +1,6 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore -import com.stevesoltys.backup.metadata.EncryptedBackupMetadata +import com.stevesoltys.seedvault.metadata.EncryptedBackupMetadata interface RestorePlugin { diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt similarity index 81% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt index 83825a06..fbbd91ee 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderFullRestorePlugin.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.transport.restore.plugins +package com.stevesoltys.seedvault.transport.restore.plugins import android.content.pm.PackageInfo -import com.stevesoltys.backup.transport.backup.plugins.DocumentsStorage -import com.stevesoltys.backup.transport.restore.FullRestorePlugin +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsStorage +import com.stevesoltys.seedvault.transport.restore.FullRestorePlugin import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt similarity index 83% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt index d24b1bd1..4d710b4a 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderKVRestorePlugin.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.transport.restore.plugins +package com.stevesoltys.seedvault.transport.restore.plugins import android.content.pm.PackageInfo import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.transport.backup.plugins.DocumentsStorage -import com.stevesoltys.backup.transport.backup.plugins.assertRightFile -import com.stevesoltys.backup.transport.restore.KVRestorePlugin +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsStorage +import com.stevesoltys.seedvault.transport.backup.plugins.assertRightFile +import com.stevesoltys.seedvault.transport.restore.KVRestorePlugin import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderRestorePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderRestorePlugin.kt similarity index 81% rename from app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderRestorePlugin.kt rename to app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderRestorePlugin.kt index 5b852e20..473066d0 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/restore/plugins/DocumentsProviderRestorePlugin.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/plugins/DocumentsProviderRestorePlugin.kt @@ -1,14 +1,14 @@ -package com.stevesoltys.backup.transport.restore.plugins +package com.stevesoltys.seedvault.transport.restore.plugins import android.util.Log import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.metadata.EncryptedBackupMetadata -import com.stevesoltys.backup.transport.backup.plugins.DocumentsStorage -import com.stevesoltys.backup.transport.backup.plugins.FILE_BACKUP_METADATA -import com.stevesoltys.backup.transport.backup.plugins.FILE_NO_MEDIA -import com.stevesoltys.backup.transport.restore.FullRestorePlugin -import com.stevesoltys.backup.transport.restore.KVRestorePlugin -import com.stevesoltys.backup.transport.restore.RestorePlugin +import com.stevesoltys.seedvault.metadata.EncryptedBackupMetadata +import com.stevesoltys.seedvault.transport.backup.plugins.DocumentsStorage +import com.stevesoltys.seedvault.transport.backup.plugins.FILE_BACKUP_METADATA +import com.stevesoltys.seedvault.transport.backup.plugins.FILE_NO_MEDIA +import com.stevesoltys.seedvault.transport.restore.FullRestorePlugin +import com.stevesoltys.seedvault.transport.restore.KVRestorePlugin +import com.stevesoltys.seedvault.transport.restore.RestorePlugin import java.io.IOException private val TAG = DocumentsProviderRestorePlugin::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/ui/BackupActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt similarity index 93% rename from app/src/main/java/com/stevesoltys/backup/ui/BackupActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt index 0a23db24..918a54c1 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/BackupActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt @@ -1,11 +1,11 @@ -package com.stevesoltys.backup.ui +package com.stevesoltys.seedvault.ui import android.view.MenuItem import android.view.View import androidx.annotation.CallSuper import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R abstract class BackupActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/LiveEvent.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/LiveEvent.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/ui/LiveEvent.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/LiveEvent.kt index b01d2840..e1444dca 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/LiveEvent.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/LiveEvent.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.ui +package com.stevesoltys.seedvault.ui import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LiveData import androidx.lifecycle.Observer -import com.stevesoltys.backup.ui.LiveEvent.ConsumableEvent +import com.stevesoltys.seedvault.ui.LiveEvent.ConsumableEvent open class LiveEvent : LiveData>() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/LiveEventHandler.java b/app/src/main/java/com/stevesoltys/seedvault/ui/LiveEventHandler.java similarity index 63% rename from app/src/main/java/com/stevesoltys/backup/ui/LiveEventHandler.java rename to app/src/main/java/com/stevesoltys/seedvault/ui/LiveEventHandler.java index 5070ddf4..858a5ef9 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/LiveEventHandler.java +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/LiveEventHandler.java @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui; +package com.stevesoltys.seedvault.ui; public interface LiveEventHandler { void onEvent(T t); diff --git a/app/src/main/java/com/stevesoltys/backup/ui/MutableLiveEvent.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/MutableLiveEvent.kt similarity index 85% rename from app/src/main/java/com/stevesoltys/backup/ui/MutableLiveEvent.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/MutableLiveEvent.kt index ff279f1a..993a2c18 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/MutableLiveEvent.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/MutableLiveEvent.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui +package com.stevesoltys.seedvault.ui class MutableLiveEvent : LiveEvent() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt similarity index 90% rename from app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt index 45913237..9410c931 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt @@ -1,11 +1,11 @@ -package com.stevesoltys.backup.ui +package com.stevesoltys.seedvault.ui import android.content.Intent import android.os.Bundle import android.util.Log import androidx.annotation.CallSuper -import com.stevesoltys.backup.ui.recoverycode.RecoveryCodeActivity -import com.stevesoltys.backup.ui.storage.StorageActivity +import com.stevesoltys.seedvault.ui.recoverycode.RecoveryCodeActivity +import com.stevesoltys.seedvault.ui.storage.StorageActivity const val REQUEST_CODE_OPEN_DOCUMENT_TREE = 1 const val REQUEST_CODE_BACKUP_LOCATION = 2 @@ -14,7 +14,7 @@ const val REQUEST_CODE_RECOVERY_CODE = 3 const val INTENT_EXTRA_IS_RESTORE = "isRestore" const val INTENT_EXTRA_IS_SETUP_WIZARD = "isSetupWizard" -private const val ACTION_SETUP_WIZARD = "com.stevesoltys.backup.restore.RESTORE_BACKUP" +private const val ACTION_SETUP_WIZARD = "com.stevesoltys.seedvault.restore.RESTORE_BACKUP" private val TAG = RequireProvisioningActivity::class.java.name diff --git a/app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt similarity index 81% rename from app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt index 59dce1fe..eea28603 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/RequireProvisioningViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.ui +package com.stevesoltys.seedvault.ui import android.app.Application import androidx.lifecycle.AndroidViewModel -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.ui.storage.StorageViewModel +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.ui.storage.StorageViewModel abstract class RequireProvisioningViewModel(protected val app: Application) : AndroidViewModel(app) { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt similarity index 87% rename from app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt index 8b2cec29..925d47bb 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt @@ -1,13 +1,13 @@ -package com.stevesoltys.backup.ui.recoverycode +package com.stevesoltys.seedvault.ui.recoverycode import android.os.Bundle import android.view.MenuItem import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.BackupActivity -import com.stevesoltys.backup.ui.INTENT_EXTRA_IS_RESTORE -import com.stevesoltys.backup.ui.INTENT_EXTRA_IS_SETUP_WIZARD -import com.stevesoltys.backup.ui.LiveEventHandler +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.BackupActivity +import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE +import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD +import com.stevesoltys.seedvault.ui.LiveEventHandler class RecoveryCodeActivity : BackupActivity() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeAdapter.kt similarity index 92% rename from app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeAdapter.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeAdapter.kt index 9db18b10..bb7b276d 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeAdapter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeAdapter.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.recoverycode +package com.stevesoltys.seedvault.ui.recoverycode import android.view.LayoutInflater import android.view.View @@ -6,7 +6,7 @@ import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.Adapter -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R class RecoveryCodeAdapter(private val items: List) : Adapter() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeInputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeInputFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt index 2d2b87b8..549c1129 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeInputFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.recoverycode +package com.stevesoltys.seedvault.ui.recoverycode import android.os.Bundle import android.view.LayoutInflater @@ -11,8 +11,8 @@ import android.widget.Toast import android.widget.Toast.LENGTH_LONG import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R -import com.stevesoltys.backup.isDebugBuild +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.isDebugBuild import io.github.novacrypto.bip39.Validation.InvalidChecksumException import io.github.novacrypto.bip39.Validation.WordNotFoundException import io.github.novacrypto.bip39.wordlists.English diff --git a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeOutputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeOutputFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt index dcbb52e7..0ceba673 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeOutputFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.recoverycode +package com.stevesoltys.seedvault.ui.recoverycode import android.content.res.Configuration.ORIENTATION_LANDSCAPE import android.os.Bundle @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R import kotlinx.android.synthetic.main.fragment_recovery_code_output.* class RecoveryCodeOutputFragment : Fragment() { diff --git a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt index a0bd0d0e..dc620924 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/recoverycode/RecoveryCodeViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.ui.recoverycode +package com.stevesoltys.seedvault.ui.recoverycode import android.app.Application import androidx.lifecycle.AndroidViewModel -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.ui.LiveEvent -import com.stevesoltys.backup.ui.MutableLiveEvent +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.ui.LiveEvent +import com.stevesoltys.seedvault.ui.MutableLiveEvent import io.github.novacrypto.bip39.* import io.github.novacrypto.bip39.Validation.InvalidChecksumException import io.github.novacrypto.bip39.Validation.InvalidWordCountException diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/BackupStorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt similarity index 89% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/BackupStorageViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt index 9f771ca1..8a406264 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/BackupStorageViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.app.Application import android.app.backup.BackupProgress @@ -7,10 +7,10 @@ import android.net.Uri import android.os.UserHandle import android.util.Log import androidx.annotation.WorkerThread -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.transport.TRANSPORT_ID -import com.stevesoltys.backup.transport.requestBackup +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.transport.TRANSPORT_ID +import com.stevesoltys.seedvault.transport.requestBackup private val TAG = BackupStorageViewModel::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/PermissionGrantActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/PermissionGrantActivity.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/PermissionGrantActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/PermissionGrantActivity.kt index ee16c9da..51bb2ccf 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/PermissionGrantActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/PermissionGrantActivity.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.content.Intent.FLAG_GRANT_PREFIX_URI_PERMISSION import android.os.Bundle diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/RestoreStorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt similarity index 86% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/RestoreStorageViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt index 86b1f7b8..a33ceb7a 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/RestoreStorageViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt @@ -1,12 +1,12 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.app.Application import android.net.Uri import android.util.Log import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.R -import com.stevesoltys.backup.transport.backup.plugins.DIRECTORY_ROOT -import com.stevesoltys.backup.transport.restore.plugins.DocumentsProviderRestorePlugin +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.transport.backup.plugins.DIRECTORY_ROOT +import com.stevesoltys.seedvault.transport.restore.plugins.DocumentsProviderRestorePlugin private val TAG = RestoreStorageViewModel::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt similarity index 91% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageActivity.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt index b5981491..2eab058a 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.content.Intent import android.os.Bundle @@ -6,11 +6,11 @@ import android.util.Log import androidx.annotation.CallSuper import androidx.appcompat.app.AlertDialog import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.BackupActivity -import com.stevesoltys.backup.ui.INTENT_EXTRA_IS_RESTORE -import com.stevesoltys.backup.ui.INTENT_EXTRA_IS_SETUP_WIZARD -import com.stevesoltys.backup.ui.LiveEventHandler +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.BackupActivity +import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE +import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD +import com.stevesoltys.seedvault.ui.LiveEventHandler private val TAG = StorageActivity::class.java.name diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageCheckFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt index 5c488215..faa4609e 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageCheckFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.os.Bundle import android.view.LayoutInflater @@ -7,7 +7,7 @@ import android.view.View.INVISIBLE import android.view.View.VISIBLE import android.view.ViewGroup import androidx.fragment.app.Fragment -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R import kotlinx.android.synthetic.main.fragment_storage_check.* private const val TITLE = "title" diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootAdapter.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt index 6bbba65d..50e80e8a 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootAdapter.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.content.Context @@ -13,8 +13,8 @@ import android.widget.TextView import androidx.appcompat.app.AlertDialog import androidx.recyclerview.widget.RecyclerView.Adapter import androidx.recyclerview.widget.RecyclerView.ViewHolder -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.storage.StorageRootAdapter.StorageRootViewHolder +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.storage.StorageRootAdapter.StorageRootViewHolder internal class StorageRootAdapter( private val isRestore: Boolean, diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootFetcher.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt similarity index 98% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootFetcher.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt index 78792c56..600f1057 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootFetcher.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.Manifest.permission.MANAGE_DOCUMENTS import android.content.Context @@ -14,7 +14,7 @@ import android.provider.DocumentsContract import android.provider.DocumentsContract.PROVIDER_INTERFACE import android.provider.DocumentsContract.Root.* import android.util.Log -import com.stevesoltys.backup.R +import com.stevesoltys.seedvault.R import java.lang.Long.parseLong private val TAG = StorageRootFetcher::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt similarity index 94% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootsFragment.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt index 8d66ee04..72f540f3 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageRootsFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.content.Intent import android.content.Intent.* @@ -12,9 +12,9 @@ import androidx.appcompat.app.AppCompatActivity.RESULT_OK import androidx.fragment.app.Fragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders -import com.stevesoltys.backup.R -import com.stevesoltys.backup.ui.INTENT_EXTRA_IS_RESTORE -import com.stevesoltys.backup.ui.REQUEST_CODE_OPEN_DOCUMENT_TREE +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE +import com.stevesoltys.seedvault.ui.REQUEST_CODE_OPEN_DOCUMENT_TREE import kotlinx.android.synthetic.main.fragment_storage_root.* private val TAG = StorageRootsFragment::class.java.simpleName diff --git a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt similarity index 90% rename from app/src/main/java/com/stevesoltys/backup/ui/storage/StorageViewModel.kt rename to app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt index fc6ad663..598121bc 100644 --- a/app/src/main/java/com/stevesoltys/backup/ui/storage/StorageViewModel.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.ui.storage +package com.stevesoltys.seedvault.ui.storage import android.app.Application import android.content.Context @@ -12,15 +12,15 @@ import android.util.Log import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import com.stevesoltys.backup.Backup -import com.stevesoltys.backup.R -import com.stevesoltys.backup.isMassStorage -import com.stevesoltys.backup.settings.BackupManagerSettings -import com.stevesoltys.backup.settings.FlashDrive -import com.stevesoltys.backup.settings.Storage -import com.stevesoltys.backup.transport.ConfigurableBackupTransportService -import com.stevesoltys.backup.ui.LiveEvent -import com.stevesoltys.backup.ui.MutableLiveEvent +import com.stevesoltys.seedvault.Backup +import com.stevesoltys.seedvault.R +import com.stevesoltys.seedvault.isMassStorage +import com.stevesoltys.seedvault.settings.BackupManagerSettings +import com.stevesoltys.seedvault.settings.FlashDrive +import com.stevesoltys.seedvault.settings.Storage +import com.stevesoltys.seedvault.transport.ConfigurableBackupTransportService +import com.stevesoltys.seedvault.ui.LiveEvent +import com.stevesoltys.seedvault.ui.MutableLiveEvent private val TAG = StorageViewModel::class.java.simpleName diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 69d15cd9..c6632033 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Backup + Seedvault Restore backup diff --git a/app/src/sharedTest/java/com/stevesoltys/backup/TestUtils.kt b/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt similarity index 96% rename from app/src/sharedTest/java/com/stevesoltys/backup/TestUtils.kt rename to app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt index 3802de2d..517daf37 100644 --- a/app/src/sharedTest/java/com/stevesoltys/backup/TestUtils.kt +++ b/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup +package com.stevesoltys.seedvault import kotlin.random.Random diff --git a/app/src/sharedTest/java/com/stevesoltys/backup/crypto/KeyManagerTestImpl.kt b/app/src/sharedTest/java/com/stevesoltys/seedvault/crypto/KeyManagerTestImpl.kt similarity index 92% rename from app/src/sharedTest/java/com/stevesoltys/backup/crypto/KeyManagerTestImpl.kt rename to app/src/sharedTest/java/com/stevesoltys/seedvault/crypto/KeyManagerTestImpl.kt index 754e9309..e787f543 100644 --- a/app/src/sharedTest/java/com/stevesoltys/backup/crypto/KeyManagerTestImpl.kt +++ b/app/src/sharedTest/java/com/stevesoltys/seedvault/crypto/KeyManagerTestImpl.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto import javax.crypto.KeyGenerator import javax.crypto.SecretKey diff --git a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoImplTest.kt b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoImplTest.kt similarity index 87% rename from app/src/test/java/com/stevesoltys/backup/crypto/CryptoImplTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoImplTest.kt index e606bb67..b3d5967d 100644 --- a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoImplTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoImplTest.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto -import com.stevesoltys.backup.header.HeaderReaderImpl -import com.stevesoltys.backup.header.HeaderWriterImpl -import com.stevesoltys.backup.header.IV_SIZE -import com.stevesoltys.backup.header.MAX_SEGMENT_LENGTH +import com.stevesoltys.seedvault.header.HeaderReaderImpl +import com.stevesoltys.seedvault.header.HeaderWriterImpl +import com.stevesoltys.seedvault.header.IV_SIZE +import com.stevesoltys.seedvault.header.MAX_SEGMENT_LENGTH import io.mockk.every import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertArrayEquals diff --git a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoIntegrationTest.kt b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoIntegrationTest.kt similarity index 89% rename from app/src/test/java/com/stevesoltys/backup/crypto/CryptoIntegrationTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoIntegrationTest.kt index a48d31e8..88031f0e 100644 --- a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoIntegrationTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoIntegrationTest.kt @@ -1,7 +1,7 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto -import com.stevesoltys.backup.header.HeaderReaderImpl -import com.stevesoltys.backup.header.HeaderWriterImpl +import com.stevesoltys.seedvault.header.HeaderReaderImpl +import com.stevesoltys.seedvault.header.HeaderWriterImpl import org.junit.jupiter.api.Assertions.assertArrayEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoTest.kt b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoTest.kt similarity index 97% rename from app/src/test/java/com/stevesoltys/backup/crypto/CryptoTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoTest.kt index e1d129dd..2b27d675 100644 --- a/app/src/test/java/com/stevesoltys/backup/crypto/CryptoTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/crypto/CryptoTest.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto -import com.stevesoltys.backup.assertContains -import com.stevesoltys.backup.getRandomByteArray -import com.stevesoltys.backup.getRandomString -import com.stevesoltys.backup.header.* +import com.stevesoltys.seedvault.assertContains +import com.stevesoltys.seedvault.getRandomByteArray +import com.stevesoltys.seedvault.getRandomString +import com.stevesoltys.seedvault.header.* import io.mockk.* import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/stevesoltys/backup/crypto/WordListTest.kt b/app/src/test/java/com/stevesoltys/seedvault/crypto/WordListTest.kt similarity index 99% rename from app/src/test/java/com/stevesoltys/backup/crypto/WordListTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/crypto/WordListTest.kt index 8fcc97c2..a4d34bcf 100644 --- a/app/src/test/java/com/stevesoltys/backup/crypto/WordListTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/crypto/WordListTest.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.crypto +package com.stevesoltys.seedvault.crypto import io.github.novacrypto.bip39.wordlists.English import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/stevesoltys/backup/header/HeaderReaderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/header/HeaderReaderTest.kt similarity index 98% rename from app/src/test/java/com/stevesoltys/backup/header/HeaderReaderTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/header/HeaderReaderTest.kt index 1cbc864c..6c06e0f3 100644 --- a/app/src/test/java/com/stevesoltys/backup/header/HeaderReaderTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/header/HeaderReaderTest.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.header +package com.stevesoltys.seedvault.header -import com.stevesoltys.backup.Utf8 -import com.stevesoltys.backup.assertContains -import com.stevesoltys.backup.getRandomString +import com.stevesoltys.seedvault.Utf8 +import com.stevesoltys.seedvault.assertContains +import com.stevesoltys.seedvault.getRandomString import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/app/src/test/java/com/stevesoltys/backup/header/HeaderWriterReaderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/header/HeaderWriterReaderTest.kt similarity index 96% rename from app/src/test/java/com/stevesoltys/backup/header/HeaderWriterReaderTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/header/HeaderWriterReaderTest.kt index a1df050b..b47dfc66 100644 --- a/app/src/test/java/com/stevesoltys/backup/header/HeaderWriterReaderTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/header/HeaderWriterReaderTest.kt @@ -1,7 +1,7 @@ -package com.stevesoltys.backup.header +package com.stevesoltys.seedvault.header -import com.stevesoltys.backup.getRandomByteArray -import com.stevesoltys.backup.getRandomString +import com.stevesoltys.seedvault.getRandomByteArray +import com.stevesoltys.seedvault.getRandomString import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance diff --git a/app/src/test/java/com/stevesoltys/backup/metadata/MetadataReaderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt similarity index 92% rename from app/src/test/java/com/stevesoltys/backup/metadata/MetadataReaderTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt index 47ac104a..e478bd23 100644 --- a/app/src/test/java/com/stevesoltys/backup/metadata/MetadataReaderTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt @@ -1,8 +1,8 @@ -package com.stevesoltys.backup.metadata +package com.stevesoltys.seedvault.metadata -import com.stevesoltys.backup.Utf8 -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.getRandomString +import com.stevesoltys.seedvault.Utf8 +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.getRandomString import io.mockk.mockk import org.json.JSONObject import org.junit.jupiter.api.Assertions.assertThrows diff --git a/app/src/test/java/com/stevesoltys/backup/metadata/MetadataWriterDecoderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt similarity index 86% rename from app/src/test/java/com/stevesoltys/backup/metadata/MetadataWriterDecoderTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt index e2f315bb..33dc9886 100644 --- a/app/src/test/java/com/stevesoltys/backup/metadata/MetadataWriterDecoderTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt @@ -1,7 +1,7 @@ -package com.stevesoltys.backup.metadata +package com.stevesoltys.seedvault.metadata -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.getRandomString +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.getRandomString import io.mockk.mockk import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/stevesoltys/backup/transport/CoordinatorIntegrationTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/CoordinatorIntegrationTest.kt similarity index 92% rename from app/src/test/java/com/stevesoltys/backup/transport/CoordinatorIntegrationTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/CoordinatorIntegrationTest.kt index 449299b0..89904481 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/CoordinatorIntegrationTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/CoordinatorIntegrationTest.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.app.backup.BackupDataInput import android.app.backup.BackupDataOutput @@ -7,17 +7,17 @@ import android.app.backup.BackupTransport.TRANSPORT_OK import android.app.backup.RestoreDescription import android.app.backup.RestoreDescription.TYPE_FULL_STREAM import android.os.ParcelFileDescriptor -import com.stevesoltys.backup.BackupNotificationManager -import com.stevesoltys.backup.crypto.CipherFactoryImpl -import com.stevesoltys.backup.crypto.CryptoImpl -import com.stevesoltys.backup.crypto.KeyManagerTestImpl -import com.stevesoltys.backup.encodeBase64 -import com.stevesoltys.backup.header.HeaderReaderImpl -import com.stevesoltys.backup.header.HeaderWriterImpl -import com.stevesoltys.backup.metadata.MetadataReaderImpl -import com.stevesoltys.backup.metadata.MetadataWriterImpl -import com.stevesoltys.backup.transport.backup.* -import com.stevesoltys.backup.transport.restore.* +import com.stevesoltys.seedvault.BackupNotificationManager +import com.stevesoltys.seedvault.crypto.CipherFactoryImpl +import com.stevesoltys.seedvault.crypto.CryptoImpl +import com.stevesoltys.seedvault.crypto.KeyManagerTestImpl +import com.stevesoltys.seedvault.encodeBase64 +import com.stevesoltys.seedvault.header.HeaderReaderImpl +import com.stevesoltys.seedvault.header.HeaderWriterImpl +import com.stevesoltys.seedvault.metadata.MetadataReaderImpl +import com.stevesoltys.seedvault.metadata.MetadataWriterImpl +import com.stevesoltys.seedvault.transport.backup.* +import com.stevesoltys.seedvault.transport.restore.* import io.mockk.* import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/app/src/test/java/com/stevesoltys/backup/transport/TransportTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/TransportTest.kt similarity index 87% rename from app/src/test/java/com/stevesoltys/backup/transport/TransportTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/TransportTest.kt index 8ec84cef..6858f600 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/TransportTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/TransportTest.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.transport +package com.stevesoltys.seedvault.transport import android.content.Context import android.content.pm.PackageInfo import android.util.Log -import com.stevesoltys.backup.crypto.Crypto -import com.stevesoltys.backup.settings.SettingsManager +import com.stevesoltys.seedvault.crypto.Crypto +import com.stevesoltys.seedvault.settings.SettingsManager import io.mockk.every import io.mockk.mockk import io.mockk.mockkStatic diff --git a/app/src/test/java/com/stevesoltys/backup/transport/backup/BackupCoordinatorTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinatorTest.kt similarity index 95% rename from app/src/test/java/com/stevesoltys/backup/transport/backup/BackupCoordinatorTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinatorTest.kt index 0af97cb6..ee843d61 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/backup/BackupCoordinatorTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinatorTest.kt @@ -1,13 +1,13 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupTransport.TRANSPORT_ERROR import android.app.backup.BackupTransport.TRANSPORT_OK import android.net.Uri import androidx.documentfile.provider.DocumentFile -import com.stevesoltys.backup.BackupNotificationManager -import com.stevesoltys.backup.getRandomString -import com.stevesoltys.backup.metadata.MetadataWriter -import com.stevesoltys.backup.settings.Storage +import com.stevesoltys.seedvault.BackupNotificationManager +import com.stevesoltys.seedvault.getRandomString +import com.stevesoltys.seedvault.metadata.MetadataWriter +import com.stevesoltys.seedvault.settings.Storage import io.mockk.Runs import io.mockk.every import io.mockk.just diff --git a/app/src/test/java/com/stevesoltys/backup/transport/backup/BackupTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupTest.kt similarity index 72% rename from app/src/test/java/com/stevesoltys/backup/transport/backup/BackupTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupTest.kt index e179943b..ddd72486 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/backup/BackupTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/BackupTest.kt @@ -1,9 +1,9 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.os.ParcelFileDescriptor -import com.stevesoltys.backup.header.HeaderWriter -import com.stevesoltys.backup.header.VersionHeader -import com.stevesoltys.backup.transport.TransportTest +import com.stevesoltys.seedvault.header.HeaderWriter +import com.stevesoltys.seedvault.header.VersionHeader +import com.stevesoltys.seedvault.transport.TransportTest import io.mockk.mockk import java.io.OutputStream import kotlin.random.Random diff --git a/app/src/test/java/com/stevesoltys/backup/transport/backup/FullBackupTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/FullBackupTest.kt similarity index 99% rename from app/src/test/java/com/stevesoltys/backup/transport/backup/FullBackupTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/backup/FullBackupTest.kt index b8b79cf7..df7ca21a 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/backup/FullBackupTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/FullBackupTest.kt @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupTransport.* import io.mockk.Runs diff --git a/app/src/test/java/com/stevesoltys/backup/transport/backup/KVBackupTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/KVBackupTest.kt similarity index 96% rename from app/src/test/java/com/stevesoltys/backup/transport/backup/KVBackupTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/backup/KVBackupTest.kt index 59955663..5ad27cdc 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/backup/KVBackupTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/backup/KVBackupTest.kt @@ -1,11 +1,11 @@ -package com.stevesoltys.backup.transport.backup +package com.stevesoltys.seedvault.transport.backup import android.app.backup.BackupDataInput import android.app.backup.BackupTransport.* -import com.stevesoltys.backup.Utf8 -import com.stevesoltys.backup.getRandomString -import com.stevesoltys.backup.header.MAX_KEY_LENGTH_SIZE -import com.stevesoltys.backup.header.VersionHeader +import com.stevesoltys.seedvault.Utf8 +import com.stevesoltys.seedvault.getRandomString +import com.stevesoltys.seedvault.header.MAX_KEY_LENGTH_SIZE +import com.stevesoltys.seedvault.header.VersionHeader import io.mockk.Runs import io.mockk.every import io.mockk.just diff --git a/app/src/test/java/com/stevesoltys/backup/transport/restore/FullRestoreTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt similarity index 95% rename from app/src/test/java/com/stevesoltys/backup/transport/restore/FullRestoreTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt index fd6ee47d..65f62727 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/restore/FullRestoreTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupTransport.* -import com.stevesoltys.backup.getRandomByteArray -import com.stevesoltys.backup.header.UnsupportedVersionException -import com.stevesoltys.backup.header.VERSION -import com.stevesoltys.backup.header.VersionHeader +import com.stevesoltys.seedvault.getRandomByteArray +import com.stevesoltys.seedvault.header.UnsupportedVersionException +import com.stevesoltys.seedvault.header.VERSION +import com.stevesoltys.seedvault.header.VersionHeader import io.mockk.Runs import io.mockk.every import io.mockk.just diff --git a/app/src/test/java/com/stevesoltys/backup/transport/restore/KVRestoreTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/KVRestoreTest.kt similarity index 96% rename from app/src/test/java/com/stevesoltys/backup/transport/restore/KVRestoreTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/restore/KVRestoreTest.kt index 2d345d2f..c6211143 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/restore/KVRestoreTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/KVRestoreTest.kt @@ -1,13 +1,13 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupDataOutput import android.app.backup.BackupTransport.TRANSPORT_ERROR import android.app.backup.BackupTransport.TRANSPORT_OK -import com.stevesoltys.backup.encodeBase64 -import com.stevesoltys.backup.getRandomByteArray -import com.stevesoltys.backup.header.UnsupportedVersionException -import com.stevesoltys.backup.header.VERSION -import com.stevesoltys.backup.header.VersionHeader +import com.stevesoltys.seedvault.encodeBase64 +import com.stevesoltys.seedvault.getRandomByteArray +import com.stevesoltys.seedvault.header.UnsupportedVersionException +import com.stevesoltys.seedvault.header.VERSION +import com.stevesoltys.seedvault.header.VersionHeader import io.mockk.* import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertThrows diff --git a/app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreCoordinatorTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt similarity index 95% rename from app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreCoordinatorTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt index 2c504cdb..b857d785 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreCoordinatorTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt @@ -1,15 +1,15 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.app.backup.BackupTransport.TRANSPORT_OK import android.app.backup.RestoreDescription import android.app.backup.RestoreDescription.* import android.content.pm.PackageInfo import android.os.ParcelFileDescriptor -import com.stevesoltys.backup.getRandomString -import com.stevesoltys.backup.metadata.BackupMetadata -import com.stevesoltys.backup.metadata.EncryptedBackupMetadata -import com.stevesoltys.backup.metadata.MetadataReader -import com.stevesoltys.backup.transport.TransportTest +import com.stevesoltys.seedvault.getRandomString +import com.stevesoltys.seedvault.metadata.BackupMetadata +import com.stevesoltys.seedvault.metadata.EncryptedBackupMetadata +import com.stevesoltys.seedvault.metadata.MetadataReader +import com.stevesoltys.seedvault.transport.TransportTest import io.mockk.Runs import io.mockk.every import io.mockk.just diff --git a/app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreTest.kt similarity index 68% rename from app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreTest.kt rename to app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreTest.kt index 577f3a6c..b240dbc8 100644 --- a/app/src/test/java/com/stevesoltys/backup/transport/restore/RestoreTest.kt +++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreTest.kt @@ -1,10 +1,10 @@ -package com.stevesoltys.backup.transport.restore +package com.stevesoltys.seedvault.transport.restore import android.os.ParcelFileDescriptor -import com.stevesoltys.backup.getRandomByteArray -import com.stevesoltys.backup.transport.TransportTest -import com.stevesoltys.backup.header.HeaderReader -import com.stevesoltys.backup.header.VERSION +import com.stevesoltys.seedvault.getRandomByteArray +import com.stevesoltys.seedvault.transport.TransportTest +import com.stevesoltys.seedvault.header.HeaderReader +import com.stevesoltys.seedvault.header.VERSION import io.mockk.mockk import java.io.InputStream import kotlin.random.Random diff --git a/deploy-prebuilt.sh b/deploy-prebuilt.sh index 1e6e8890..18cb494a 100755 --- a/deploy-prebuilt.sh +++ b/deploy-prebuilt.sh @@ -2,7 +2,7 @@ # # Script to deploy to a prebuilt repo. -REPO_URL="https://stevesoltys:$GITHUB_API_KEY@github.com/stevesoltys/backup-prebuilt" +REPO_URL="https://stevesoltys:$GITHUB_API_KEY@github.com/stevesoltys/seedvault-prebuilt" TAG=$(git tag -l --points-at HEAD) git config --global user.email "github@stevesoltys.com" @@ -14,11 +14,11 @@ git checkout $TRAVIS_BRANCH || git checkout -b $TRAVIS_BRANCH rm -Rf ./* cp $TRAVIS_BUILD_DIR/Android.mk . cp $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/app-release-unsigned.apk ./Backup.apk -cp $TRAVIS_BUILD_DIR/permissions_com.stevesoltys.backup.xml . -cp $TRAVIS_BUILD_DIR/whitelist_com.stevesoltys.backup.xml . +cp $TRAVIS_BUILD_DIR/permissions_com.stevesoltys.seedvault.xml . +cp $TRAVIS_BUILD_DIR/whitelist_com.stevesoltys.seedvault.xml . git add . -git commit -m "Travis build $TRAVIS_BUILD_NUMBER" -m "https://github.com/stevesoltys/backup/commit/$TRAVIS_COMMIT" +git commit -m "Travis build $TRAVIS_BUILD_NUMBER" -m "https://github.com/stevesoltys/seedvault/commit/$TRAVIS_COMMIT" git push origin $TRAVIS_BRANCH if [ ! -z ${TAG} ]; then diff --git a/permissions_com.stevesoltys.backup.xml b/permissions_com.stevesoltys.seedvault.xml similarity index 77% rename from permissions_com.stevesoltys.backup.xml rename to permissions_com.stevesoltys.seedvault.xml index f0195387..ef41a134 100644 --- a/permissions_com.stevesoltys.backup.xml +++ b/permissions_com.stevesoltys.seedvault.xml @@ -1,6 +1,6 @@ - + diff --git a/whitelist_com.stevesoltys.backup.xml b/whitelist_com.stevesoltys.seedvault.xml similarity index 52% rename from whitelist_com.stevesoltys.backup.xml rename to whitelist_com.stevesoltys.seedvault.xml index bc98e4c7..64321699 100644 --- a/whitelist_com.stevesoltys.backup.xml +++ b/whitelist_com.stevesoltys.seedvault.xml @@ -1,5 +1,5 @@ + service="com.stevesoltys.seedvault/.transport.ConfigurableBackupTransportService"/>