From ea80704598987da30818cb5a2320c7cf18a9f834 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 May 2018 17:44:21 +0200 Subject: [PATCH] split up everything into 'full' and 'basic' build flavor "full" is the original F-Droid app with all the features. It should still build the exact same app after this change. "basic" is the smallest version of F-Droid possible. It does not yet build, nor work. --- app/build.gradle | 30 ++++++++++++++----- .../javax/jmdns/impl/FDroidServiceInfo.java | 0 .../kellinwood/logging/AbstractLogger.java | 0 .../logging/ConsoleLoggerFactory.java | 0 .../kellinwood/logging/LoggerFactory.java | 0 .../kellinwood/logging/LoggerInterface.java | 0 .../kellinwood/logging/LoggerManager.java | 0 .../kellinwood/logging/NullLoggerFactory.java | 0 .../java/kellinwood/logging/StreamLogger.java | 0 .../security/zipsigner/AutoKeyException.java | 0 .../kellinwood/security/zipsigner/Base64.java | 0 .../zipsigner/DefaultResourceAdapter.java | 0 .../security/zipsigner/HexDumpEncoder.java | 0 .../security/zipsigner/HexEncoder.java | 0 .../kellinwood/security/zipsigner/KeySet.java | 0 .../security/zipsigner/ProgressEvent.java | 0 .../security/zipsigner/ProgressHelper.java | 0 .../security/zipsigner/ProgressListener.java | 0 .../security/zipsigner/ResourceAdapter.java | 0 .../security/zipsigner/ZipSignature.java | 0 .../security/zipsigner/ZipSigner.java | 0 .../zipsigner/optional/CertCreator.java | 0 .../zipsigner/optional/CustomKeySigner.java | 0 .../optional/DistinguishedNameValues.java | 0 .../zipsigner/optional/Fingerprint.java | 0 .../security/zipsigner/optional/JKS.java | 0 .../zipsigner/optional/JksKeyStore.java | 0 .../optional/KeyNameConflictException.java | 0 .../optional/KeyStoreFileManager.java | 0 .../optional/LoadKeystoreException.java | 0 .../optional/PasswordObfuscator.java | 0 .../optional/SignatureBlockGenerator.java | 0 .../java/kellinwood/zipio/CentralEnd.java | 0 .../java/kellinwood/zipio/ZioEntry.java | 0 .../kellinwood/zipio/ZioEntryInputStream.java | 0 .../zipio/ZioEntryOutputStream.java | 0 .../java/kellinwood/zipio/ZipInput.java | 0 .../kellinwood/zipio/ZipListingHelper.java | 0 .../java/kellinwood/zipio/ZipOutput.java | 0 .../localrepo/CacheSwapAppsService.java | 0 .../fdroid/localrepo/LocalRepoKeyStore.java | 0 .../fdroid/localrepo/LocalRepoManager.java | 0 .../fdroid/fdroid/localrepo/SwapService.java | 0 .../localrepo/peers/BluetoothFinder.java | 0 .../fdroid/localrepo/peers/BluetoothPeer.java | 0 .../fdroid/localrepo/peers/BonjourFinder.java | 0 .../fdroid/localrepo/peers/BonjourPeer.java | 0 .../fdroid/fdroid/localrepo/peers/Peer.java | 0 .../fdroid/localrepo/peers/PeerFinder.java | 0 .../fdroid/localrepo/peers/WifiPeer.java | 0 .../fdroid/localrepo/type/BluetoothSwap.java | 0 .../localrepo/type/BonjourBroadcast.java | 0 .../fdroid/localrepo/type/SwapType.java | 0 .../fdroid/localrepo/type/WifiSwap.java | 0 .../org/fdroid/fdroid/net/LocalHTTPD.java | 0 .../fdroid/net/WifiStateChangeService.java | 0 .../fdroid/net/bluetooth/BluetoothClient.java | 0 .../fdroid/net/bluetooth/BluetoothServer.java | 0 .../receiver/WifiStateChangeReceiver.java | 0 .../views/hiding/CalculatorActivity.java | 0 .../fdroid/views/hiding/HidingManager.java | 0 .../views/main/CategoriesViewBinder.java | 0 .../fdroid/views/main/MainViewController.java | 0 .../fdroid/views/main/WhatsNewViewBinder.java | 0 .../fdroid/views/panic/ExitActivity.java | 0 .../views/panic/PanicPreferencesActivity.java | 0 .../views/panic/PanicPreferencesFragment.java | 0 .../views/panic/PanicResponderActivity.java | 0 .../fdroid/views/swap/ConfirmReceive.java | 0 .../fdroid/views/swap/InitialLoadingView.java | 0 .../fdroid/views/swap/JoinWifiView.java | 0 .../org/fdroid/fdroid/views/swap/NfcView.java | 0 .../fdroid/views/swap/SelectAppsView.java | 0 .../fdroid/views/swap/SendFDroidView.java | 0 .../fdroid/views/swap/StartSwapView.java | 0 .../fdroid/views/swap/SwapAppsView.java | 0 .../fdroid/views/swap/SwapConnecting.java | 0 .../views/swap/SwapWorkflowActivity.java | 0 .../fdroid/fdroid/views/swap/WifiQrView.java | 0 .../camera/CameraCharacteristicsChecker.java | 0 .../CameraCharacteristicsMaxApiLevel20.java | 0 .../CameraCharacteristicsMinApiLevel21.java | 0 .../res/layout/activity_calculator.xml | 0 .../res/menu/main_activity_screens.xml | 0 .../res/xml/preferences_panic.xml | 0 .../net/WifiStateChangeServiceTest.java | 0 86 files changed, 23 insertions(+), 7 deletions(-) rename app/src/{main => full}/java/javax/jmdns/impl/FDroidServiceInfo.java (100%) rename app/src/{main => full}/java/kellinwood/logging/AbstractLogger.java (100%) rename app/src/{main => full}/java/kellinwood/logging/ConsoleLoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerInterface.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerManager.java (100%) rename app/src/{main => full}/java/kellinwood/logging/NullLoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/StreamLogger.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/AutoKeyException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/Base64.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/HexDumpEncoder.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/HexEncoder.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/KeySet.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressEvent.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressHelper.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressListener.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ResourceAdapter.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ZipSignature.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ZipSigner.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/CertCreator.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/Fingerprint.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/JKS.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/JksKeyStore.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/CentralEnd.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntry.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntryInputStream.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntryOutputStream.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipInput.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipListingHelper.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipOutput.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/SwapService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/Peer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/SwapType.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/LocalHTTPD.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/WifiStateChangeService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/hiding/HidingManager.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/MainViewController.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/ExitActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/JoinWifiView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/NfcView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SelectAppsView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SendFDroidView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/StartSwapView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapAppsView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapConnecting.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/WifiQrView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java (100%) rename app/src/{main => full}/res/layout/activity_calculator.xml (100%) rename app/src/{main => full}/res/menu/main_activity_screens.xml (100%) rename app/src/{main => full}/res/xml/preferences_panic.xml (100%) rename app/src/{test => testFull}/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java (100%) diff --git a/app/build.gradle b/app/build.gradle index 4378d6879..7376e1fbc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,9 @@ def getVersionName = { -> def isCi = "true".equals(System.getenv("CI")) def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) +def fullApplicationId = "org.fdroid.fdroid" +def basicApplicationId = "org.fdroid.basic" + android { compileSdkVersion 27 buildToolsVersion '27.0.3' @@ -31,6 +34,20 @@ android { } } + flavorDimensions "base" + productFlavors { + full { + dimension "base" + applicationId fullApplicationId + resValue "string", "applicationId", fullApplicationId + } + basic { + dimension "base" + applicationId basicApplicationId + resValue "string", "applicationId", basicApplicationId + } + } + compileOptions { compileOptions.encoding = "UTF-8" } @@ -49,15 +66,13 @@ android { defaultConfig { versionCode 1003001 versionName getVersionName() - applicationId 'org.fdroid.fdroid' - resValue "string", "applicationId", applicationId testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { debug { applicationIdSuffix ".debug" - resValue "string", "applicationId", defaultConfig.applicationId + applicationIdSuffix + resValue "string", "applicationId", fullApplicationId + applicationIdSuffix versionNameSuffix "-debug" println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode } @@ -125,13 +140,10 @@ dependencies { implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.zxing:core:3.3.2' implementation 'eu.chainfire:libsuperuser:1.0.0.201602271131' - implementation 'cc.mvdan.accesspoint:library:0.2.0' implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' implementation 'info.guardianproject.panic:panic:0.5' implementation 'commons-io:commons-io:2.5' implementation 'commons-net:commons-net:3.5' - implementation 'org.jmdns:jmdns:3.5.3' - implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation 'ch.acra:acra:4.9.1' implementation 'io.reactivex:rxjava:1.1.0' implementation 'io.reactivex:rxandroid:0.23.0' @@ -142,10 +154,14 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' implementation 'com.fasterxml.jackson.core:jackson-databind:2.8.7' - implementation 'org.bouncycastle:bcpkix-jdk15on:1.59' implementation 'org.bouncycastle:bcprov-jdk15on:1.59' + fullImplementation 'org.bouncycastle:bcpkix-jdk15on:1.59' + fullImplementation 'cc.mvdan.accesspoint:library:0.2.0' + fullImplementation 'org.jmdns:jmdns:3.5.3' + fullImplementation 'org.nanohttpd:nanohttpd:2.3.1' testImplementation 'org.robolectric:robolectric:3.8' + testImplementation 'org.bouncycastle:bcprov-jdk15on:1.59' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.7.22' diff --git a/app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java similarity index 100% rename from app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java rename to app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java diff --git a/app/src/main/java/kellinwood/logging/AbstractLogger.java b/app/src/full/java/kellinwood/logging/AbstractLogger.java similarity index 100% rename from app/src/main/java/kellinwood/logging/AbstractLogger.java rename to app/src/full/java/kellinwood/logging/AbstractLogger.java diff --git a/app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java b/app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java rename to app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/LoggerFactory.java b/app/src/full/java/kellinwood/logging/LoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerFactory.java rename to app/src/full/java/kellinwood/logging/LoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/LoggerInterface.java b/app/src/full/java/kellinwood/logging/LoggerInterface.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerInterface.java rename to app/src/full/java/kellinwood/logging/LoggerInterface.java diff --git a/app/src/main/java/kellinwood/logging/LoggerManager.java b/app/src/full/java/kellinwood/logging/LoggerManager.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerManager.java rename to app/src/full/java/kellinwood/logging/LoggerManager.java diff --git a/app/src/main/java/kellinwood/logging/NullLoggerFactory.java b/app/src/full/java/kellinwood/logging/NullLoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/NullLoggerFactory.java rename to app/src/full/java/kellinwood/logging/NullLoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/StreamLogger.java b/app/src/full/java/kellinwood/logging/StreamLogger.java similarity index 100% rename from app/src/main/java/kellinwood/logging/StreamLogger.java rename to app/src/full/java/kellinwood/logging/StreamLogger.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java b/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java rename to app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/Base64.java b/app/src/full/java/kellinwood/security/zipsigner/Base64.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/Base64.java rename to app/src/full/java/kellinwood/security/zipsigner/Base64.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java rename to app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java rename to app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexEncoder.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java rename to app/src/full/java/kellinwood/security/zipsigner/HexEncoder.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/KeySet.java b/app/src/full/java/kellinwood/security/zipsigner/KeySet.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/KeySet.java rename to app/src/full/java/kellinwood/security/zipsigner/KeySet.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java rename to app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java b/app/src/full/java/kellinwood/security/zipsigner/ZipSignature.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java rename to app/src/full/java/kellinwood/security/zipsigner/ZipSignature.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java b/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java rename to app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/CertCreator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/CertCreator.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java b/app/src/full/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java b/app/src/full/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java b/app/src/full/java/kellinwood/security/zipsigner/optional/Fingerprint.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/Fingerprint.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java b/app/src/full/java/kellinwood/security/zipsigner/optional/JKS.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/JKS.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java b/app/src/full/java/kellinwood/security/zipsigner/optional/JksKeyStore.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/JksKeyStore.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java b/app/src/full/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java b/app/src/full/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java b/app/src/full/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java diff --git a/app/src/main/java/kellinwood/zipio/CentralEnd.java b/app/src/full/java/kellinwood/zipio/CentralEnd.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/CentralEnd.java rename to app/src/full/java/kellinwood/zipio/CentralEnd.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntry.java b/app/src/full/java/kellinwood/zipio/ZioEntry.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntry.java rename to app/src/full/java/kellinwood/zipio/ZioEntry.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java rename to app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java rename to app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java diff --git a/app/src/main/java/kellinwood/zipio/ZipInput.java b/app/src/full/java/kellinwood/zipio/ZipInput.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipInput.java rename to app/src/full/java/kellinwood/zipio/ZipInput.java diff --git a/app/src/main/java/kellinwood/zipio/ZipListingHelper.java b/app/src/full/java/kellinwood/zipio/ZipListingHelper.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipListingHelper.java rename to app/src/full/java/kellinwood/zipio/ZipListingHelper.java diff --git a/app/src/main/java/kellinwood/zipio/ZipOutput.java b/app/src/full/java/kellinwood/zipio/ZipOutput.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipOutput.java rename to app/src/full/java/kellinwood/zipio/ZipOutput.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/SwapType.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/SwapType.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java rename to app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java rename to app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java rename to app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java rename to app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java rename to app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/hiding/HidingManager.java rename to app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java rename to app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java rename to app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java rename to app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/ExitActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SendFDroidView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SendFDroidView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java diff --git a/app/src/main/res/layout/activity_calculator.xml b/app/src/full/res/layout/activity_calculator.xml similarity index 100% rename from app/src/main/res/layout/activity_calculator.xml rename to app/src/full/res/layout/activity_calculator.xml diff --git a/app/src/main/res/menu/main_activity_screens.xml b/app/src/full/res/menu/main_activity_screens.xml similarity index 100% rename from app/src/main/res/menu/main_activity_screens.xml rename to app/src/full/res/menu/main_activity_screens.xml diff --git a/app/src/main/res/xml/preferences_panic.xml b/app/src/full/res/xml/preferences_panic.xml similarity index 100% rename from app/src/main/res/xml/preferences_panic.xml rename to app/src/full/res/xml/preferences_panic.xml diff --git a/app/src/test/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java b/app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java similarity index 100% rename from app/src/test/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java rename to app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java