diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63d4fcab5..cebdae9e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,14 +10,14 @@ gradle: - export GRADLE_USER_HOME=$PWD/.gradle - ./gradlew assemble # always report on lint errors to the build log - - sed -i -e 's,textReport .*,textReport true,' F-Droid/build.gradle + - sed -i -e 's,textReport .*,textReport true,' app/build.gradle - ./gradlew check - echo no | android create avd --force -n fcl-test -t android-10 -b armeabi - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window & - ./tools/wait-for-emulator - adb shell input keyevent 82 - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || { adb logcat -d '*:W'; exit 1; } - - sed -n 's/.*"ctr2">\([0-9]*\)%<.*/Coverage - \1.0% covered\n/p' F-Droid/build/reports/coverage/debug/index.html + - sed -n 's/.*"ctr2">\([0-9]*\)%<.*/Coverage - \1.0% covered\n/p' app/build/reports/coverage/debug/index.html pmd: script: @@ -31,6 +31,6 @@ checkstyle: tools: script: - - cd F-Droid + - cd app - ./tools/langs-list-check.py - ./tools/check-string-format.py diff --git a/Android.mk b/Android.mk index 11266c0ae..3c1b8bd50 100644 --- a/Android.mk +++ b/Android.mk @@ -7,7 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_PACKAGE_NAME := F-Droid fdroid_root := $(LOCAL_PATH) -fdroid_dir := F-Droid +fdroid_dir := app fdroid_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates fdroid_build := $(fdroid_root)/$(fdroid_dir)/build fdroid_apk := build/outputs/apk/F-Droid-release-unsigned.apk @@ -23,4 +23,4 @@ LOCAL_SRC_FILES := $(fdroid_dir)/$(fdroid_apk) LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -include $(BUILD_PREBUILT) \ No newline at end of file +include $(BUILD_PREBUILT) diff --git a/README.md b/README.md index a7945fa42..6c365f460 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,7 @@ for Android. ## Building with Gradle - cd F-Droid - ../gradlew assembleRelease + ./gradlew assembleRelease ## Direct download diff --git a/F-Droid/build.gradle b/app/build.gradle similarity index 92% rename from F-Droid/build.gradle rename to app/build.gradle index bb10eb128..5fea53e9c 100644 --- a/F-Droid/build.gradle +++ b/app/build.gradle @@ -123,29 +123,6 @@ android { buildToolsVersion '23.0.2' useLibrary 'org.apache.http.legacy' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - androidTest.setRoot('test') - androidTest { - manifest.srcFile 'test/AndroidManifest.xml' - java.srcDirs = ['test/src'] - resources.srcDirs = ['test/src'] - aidl.srcDirs = ['test/src'] - renderscript.srcDirs = ['test/src'] - res.srcDirs = ['test/res'] - assets.srcDirs = ['test/assets'] - } - } - buildTypes { // use proguard on debug too since we have unknowingly broken // release builds before. @@ -167,6 +144,11 @@ android { targetCompatibility JavaVersion.VERSION_1_7 } + testOptions { + // prevent tests from dying on android.util.Log calls + unitTests.returnDefaultValues = true + } + lintOptions { checkReleaseBuilds false abortOnError false diff --git a/F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar b/app/libs/binaryDeps/nanohttpd-2.1.0.jar similarity index 100% rename from F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar rename to app/libs/binaryDeps/nanohttpd-2.1.0.jar diff --git a/F-Droid/libs/binaryDeps/support-v4-preferencefragment-release.aar b/app/libs/binaryDeps/support-v4-preferencefragment-release.aar similarity index 100% rename from F-Droid/libs/binaryDeps/support-v4-preferencefragment-release.aar rename to app/libs/binaryDeps/support-v4-preferencefragment-release.aar diff --git a/F-Droid/libs/binaryDeps/zipsigner.jar b/app/libs/binaryDeps/zipsigner.jar similarity index 100% rename from F-Droid/libs/binaryDeps/zipsigner.jar rename to app/libs/binaryDeps/zipsigner.jar diff --git a/F-Droid/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from F-Droid/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/F-Droid/test/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml similarity index 100% rename from F-Droid/test/AndroidManifest.xml rename to app/src/androidTest/AndroidManifest.xml diff --git a/F-Droid/test/assets/README.md b/app/src/androidTest/assets/README.md similarity index 100% rename from F-Droid/test/assets/README.md rename to app/src/androidTest/assets/README.md diff --git a/F-Droid/test/assets/largeRepo.xml b/app/src/androidTest/assets/largeRepo.xml similarity index 100% rename from F-Droid/test/assets/largeRepo.xml rename to app/src/androidTest/assets/largeRepo.xml diff --git a/F-Droid/test/assets/masterKeyIndex.jar b/app/src/androidTest/assets/masterKeyIndex.jar similarity index 100% rename from F-Droid/test/assets/masterKeyIndex.jar rename to app/src/androidTest/assets/masterKeyIndex.jar diff --git a/F-Droid/test/assets/mediumRepo.xml b/app/src/androidTest/assets/mediumRepo.xml similarity index 100% rename from F-Droid/test/assets/mediumRepo.xml rename to app/src/androidTest/assets/mediumRepo.xml diff --git a/F-Droid/test/assets/multiRepo.archive.jar b/app/src/androidTest/assets/multiRepo.archive.jar similarity index 100% rename from F-Droid/test/assets/multiRepo.archive.jar rename to app/src/androidTest/assets/multiRepo.archive.jar diff --git a/F-Droid/test/assets/multiRepo.conflicting.jar b/app/src/androidTest/assets/multiRepo.conflicting.jar similarity index 100% rename from F-Droid/test/assets/multiRepo.conflicting.jar rename to app/src/androidTest/assets/multiRepo.conflicting.jar diff --git a/F-Droid/test/assets/multiRepo.normal.jar b/app/src/androidTest/assets/multiRepo.normal.jar similarity index 100% rename from F-Droid/test/assets/multiRepo.normal.jar rename to app/src/androidTest/assets/multiRepo.normal.jar diff --git a/F-Droid/test/assets/simpleIndex.jar b/app/src/androidTest/assets/simpleIndex.jar similarity index 100% rename from F-Droid/test/assets/simpleIndex.jar rename to app/src/androidTest/assets/simpleIndex.jar diff --git a/F-Droid/test/assets/simpleIndex.xml b/app/src/androidTest/assets/simpleIndex.xml similarity index 100% rename from F-Droid/test/assets/simpleIndex.xml rename to app/src/androidTest/assets/simpleIndex.xml diff --git a/F-Droid/test/assets/simpleIndexWithCorruptedCertificate.jar b/app/src/androidTest/assets/simpleIndexWithCorruptedCertificate.jar similarity index 100% rename from F-Droid/test/assets/simpleIndexWithCorruptedCertificate.jar rename to app/src/androidTest/assets/simpleIndexWithCorruptedCertificate.jar diff --git a/F-Droid/test/assets/simpleIndexWithCorruptedEverything.jar b/app/src/androidTest/assets/simpleIndexWithCorruptedEverything.jar similarity index 100% rename from F-Droid/test/assets/simpleIndexWithCorruptedEverything.jar rename to app/src/androidTest/assets/simpleIndexWithCorruptedEverything.jar diff --git a/F-Droid/test/assets/simpleIndexWithCorruptedManifest.jar b/app/src/androidTest/assets/simpleIndexWithCorruptedManifest.jar similarity index 100% rename from F-Droid/test/assets/simpleIndexWithCorruptedManifest.jar rename to app/src/androidTest/assets/simpleIndexWithCorruptedManifest.jar diff --git a/F-Droid/test/assets/simpleIndexWithCorruptedSignature.jar b/app/src/androidTest/assets/simpleIndexWithCorruptedSignature.jar similarity index 100% rename from F-Droid/test/assets/simpleIndexWithCorruptedSignature.jar rename to app/src/androidTest/assets/simpleIndexWithCorruptedSignature.jar diff --git a/F-Droid/test/assets/simpleIndexWithoutSignature.jar b/app/src/androidTest/assets/simpleIndexWithoutSignature.jar similarity index 100% rename from F-Droid/test/assets/simpleIndexWithoutSignature.jar rename to app/src/androidTest/assets/simpleIndexWithoutSignature.jar diff --git a/F-Droid/test/assets/smallRepo.xml b/app/src/androidTest/assets/smallRepo.xml similarity index 100% rename from F-Droid/test/assets/smallRepo.xml rename to app/src/androidTest/assets/smallRepo.xml diff --git a/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java b/app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java similarity index 100% rename from F-Droid/test/src/android/test/ProviderTestCase2MockContext.java rename to app/src/androidTest/java/android/test/ProviderTestCase2MockContext.java diff --git a/F-Droid/test/src/mock/MockApplicationInfo.java b/app/src/androidTest/java/mock/MockApplicationInfo.java similarity index 100% rename from F-Droid/test/src/mock/MockApplicationInfo.java rename to app/src/androidTest/java/mock/MockApplicationInfo.java diff --git a/F-Droid/test/src/mock/MockCategoryResources.java b/app/src/androidTest/java/mock/MockCategoryResources.java similarity index 100% rename from F-Droid/test/src/mock/MockCategoryResources.java rename to app/src/androidTest/java/mock/MockCategoryResources.java diff --git a/F-Droid/test/src/mock/MockContextEmptyComponents.java b/app/src/androidTest/java/mock/MockContextEmptyComponents.java similarity index 100% rename from F-Droid/test/src/mock/MockContextEmptyComponents.java rename to app/src/androidTest/java/mock/MockContextEmptyComponents.java diff --git a/F-Droid/test/src/mock/MockContextSwappableComponents.java b/app/src/androidTest/java/mock/MockContextSwappableComponents.java similarity index 100% rename from F-Droid/test/src/mock/MockContextSwappableComponents.java rename to app/src/androidTest/java/mock/MockContextSwappableComponents.java diff --git a/F-Droid/test/src/mock/MockEmptyPackageManager.java b/app/src/androidTest/java/mock/MockEmptyPackageManager.java similarity index 100% rename from F-Droid/test/src/mock/MockEmptyPackageManager.java rename to app/src/androidTest/java/mock/MockEmptyPackageManager.java diff --git a/F-Droid/test/src/mock/MockEmptyResources.java b/app/src/androidTest/java/mock/MockEmptyResources.java similarity index 100% rename from F-Droid/test/src/mock/MockEmptyResources.java rename to app/src/androidTest/java/mock/MockEmptyResources.java diff --git a/F-Droid/test/src/mock/MockFDroidResources.java b/app/src/androidTest/java/mock/MockFDroidResources.java similarity index 100% rename from F-Droid/test/src/mock/MockFDroidResources.java rename to app/src/androidTest/java/mock/MockFDroidResources.java diff --git a/F-Droid/test/src/mock/MockInstallablePackageManager.java b/app/src/androidTest/java/mock/MockInstallablePackageManager.java similarity index 100% rename from F-Droid/test/src/mock/MockInstallablePackageManager.java rename to app/src/androidTest/java/mock/MockInstallablePackageManager.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java index 6919b0479..7e7b27d77 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class ApkProviderHelperTest extends BaseApkProviderTest { public void testKnownApks() { diff --git a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java index 2ec82cffe..922b69639 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java @@ -14,6 +14,7 @@ import org.fdroid.fdroid.mock.MockRepo; import java.util.ArrayList; import java.util.List; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class ApkProviderTest extends BaseApkProviderTest { /** diff --git a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java index fa3d55957..81f0e5a22 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java @@ -17,6 +17,7 @@ import mock.MockCategoryResources; import mock.MockContextSwappableComponents; import mock.MockInstallablePackageManager; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class AppProviderTest extends FDroidProviderTest { public AppProviderTest() { diff --git a/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java index 76a803fdb..e9f9e9517 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java @@ -22,6 +22,7 @@ import mock.MockContextEmptyComponents; import mock.MockContextSwappableComponents; import mock.MockFDroidResources; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public abstract class FDroidProviderTest extends ProviderTestCase2MockContext { private FDroidProvider[] allProviders = { diff --git a/F-Droid/test/src/org/fdroid/fdroid/FDroidTest.java b/app/src/androidTest/java/org/fdroid/fdroid/FDroidTest.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/FDroidTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/FDroidTest.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java b/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java similarity index 97% rename from F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java index 73d6188de..53be0b601 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/FileCompatTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/FileCompatTest.java @@ -10,6 +10,7 @@ import org.fdroid.fdroid.data.SanitizedFile; import java.io.File; import java.util.UUID; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class FileCompatTest extends InstrumentationTestCase { private static final String TAG = "FileCompatTest"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java index 840972e17..0af7acde9 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java @@ -10,6 +10,7 @@ import mock.MockInstallablePackageManager; * For practical reasons, it extends FDroidProviderTest, although there is also a * separate test for the InstalledAppProvider which tests the CRUD operations in more detail. */ +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class InstalledAppCacheTest extends FDroidProviderTest { private MockInstallablePackageManager packageManager; diff --git a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java index 21386d660..1613eecb5 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java @@ -9,6 +9,7 @@ import org.fdroid.fdroid.data.RepoProvider; import mock.MockInstallablePackageManager; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class InstalledAppProviderTest extends FDroidProviderTest { private MockInstallablePackageManager packageManager; diff --git a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java index b6f1e6c81..04978533e 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/MultiRepoUpdaterTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java @@ -28,6 +28,7 @@ import java.io.File; import java.util.List; import java.util.UUID; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class MultiRepoUpdaterTest extends InstrumentationTestCase { private static final String TAG = "RepoUpdaterTest"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java similarity index 98% rename from F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java index b8d755724..8aa99a9e1 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/RepoUpdaterTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/RepoUpdaterTest.java @@ -9,6 +9,7 @@ import org.fdroid.fdroid.data.Repo; import java.io.File; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class RepoUpdaterTest extends InstrumentationTestCase { private static final String TAG = "RepoUpdaterTest"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java b/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java index 37df10d49..dcbb8bd43 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/RepoXMLHandlerTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/RepoXMLHandlerTest.java @@ -24,6 +24,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class RepoXMLHandlerTest extends AndroidTestCase { private static final String TAG = "RepoXMLHandlerTest"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java b/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java similarity index 96% rename from F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java index 0c84550fd..6a9a9068b 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/SanitizedFileTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/SanitizedFileTest.java @@ -6,6 +6,7 @@ import org.fdroid.fdroid.data.SanitizedFile; import java.io.File; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class SanitizedFileTest extends AndroidTestCase { public void testSanitizedFile() { diff --git a/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/TestUtils.java rename to app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/UtilsTest.java b/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java similarity index 99% rename from F-Droid/test/src/org/fdroid/fdroid/UtilsTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java index 270f89fb6..7e4265f56 100644 --- a/F-Droid/test/src/org/fdroid/fdroid/UtilsTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/UtilsTest.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid; import android.test.AndroidTestCase; +@SuppressWarnings("PMD") // TODO port this to JUnit 4 semantics public class UtilsTest extends AndroidTestCase { String fdroidFingerprint = "43238D512C1E5EB2D6569F4A3AFBF5523418B82E0A3ED1552770ABB9A9C9CCAB"; diff --git a/F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java b/app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatForTest.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/compat/FileCompatForTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/compat/FileCompatForTest.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java b/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java rename to app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java b/app/src/androidTest/java/org/fdroid/fdroid/mock/MockApp.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java rename to app/src/androidTest/java/org/fdroid/fdroid/mock/MockApp.java diff --git a/F-Droid/test/src/org/fdroid/fdroid/mock/MockRepo.java b/app/src/androidTest/java/org/fdroid/fdroid/mock/MockRepo.java similarity index 100% rename from F-Droid/test/src/org/fdroid/fdroid/mock/MockRepo.java rename to app/src/androidTest/java/org/fdroid/fdroid/mock/MockRepo.java diff --git a/F-Droid/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from F-Droid/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/F-Droid/assets/index.template.html b/app/src/main/assets/index.template.html similarity index 100% rename from F-Droid/assets/index.template.html rename to app/src/main/assets/index.template.html diff --git a/F-Droid/assets/swap-icon.png b/app/src/main/assets/swap-icon.png similarity index 100% rename from F-Droid/assets/swap-icon.png rename to app/src/main/assets/swap-icon.png diff --git a/F-Droid/assets/swap-icon.svg b/app/src/main/assets/swap-icon.svg similarity index 100% rename from F-Droid/assets/swap-icon.svg rename to app/src/main/assets/swap-icon.svg diff --git a/F-Droid/assets/swap-tick-done.png b/app/src/main/assets/swap-tick-done.png similarity index 100% rename from F-Droid/assets/swap-tick-done.png rename to app/src/main/assets/swap-tick-done.png diff --git a/F-Droid/assets/swap-tick-not-done.png b/app/src/main/assets/swap-tick-not-done.png similarity index 100% rename from F-Droid/assets/swap-tick-not-done.png rename to app/src/main/assets/swap-tick-not-done.png diff --git a/F-Droid/src/com/google/zxing/encode/Contents.java b/app/src/main/java/com/google/zxing/encode/Contents.java similarity index 100% rename from F-Droid/src/com/google/zxing/encode/Contents.java rename to app/src/main/java/com/google/zxing/encode/Contents.java diff --git a/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java b/app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java similarity index 100% rename from F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java rename to app/src/main/java/com/google/zxing/encode/QRCodeEncoder.java diff --git a/F-Droid/src/com/google/zxing/integration/android/IntentIntegrator.java b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java similarity index 100% rename from F-Droid/src/com/google/zxing/integration/android/IntentIntegrator.java rename to app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java diff --git a/F-Droid/src/com/google/zxing/integration/android/IntentResult.java b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java similarity index 100% rename from F-Droid/src/com/google/zxing/integration/android/IntentResult.java rename to app/src/main/java/com/google/zxing/integration/android/IntentResult.java diff --git a/F-Droid/src/javax/jmdns/impl/FDroidServiceInfo.java b/app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java similarity index 100% rename from F-Droid/src/javax/jmdns/impl/FDroidServiceInfo.java rename to app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java diff --git a/F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java b/app/src/main/java/org/apache/commons/io/input/BoundedInputStream.java similarity index 100% rename from F-Droid/src/org/apache/commons/io/input/BoundedInputStream.java rename to app/src/main/java/org/apache/commons/io/input/BoundedInputStream.java diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/AppDetails.java rename to app/src/main/java/org/fdroid/fdroid/AppDetails.java diff --git a/F-Droid/src/org/fdroid/fdroid/AppFilter.java b/app/src/main/java/org/fdroid/fdroid/AppFilter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/AppFilter.java rename to app/src/main/java/org/fdroid/fdroid/AppFilter.java diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java rename to app/src/main/java/org/fdroid/fdroid/CompatibilityChecker.java diff --git a/F-Droid/src/org/fdroid/fdroid/CrashReportActivity.java b/app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/CrashReportActivity.java rename to app/src/main/java/org/fdroid/fdroid/CrashReportActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/app/src/main/java/org/fdroid/fdroid/FDroid.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/FDroid.java rename to app/src/main/java/org/fdroid/fdroid/FDroid.java diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java similarity index 99% rename from F-Droid/src/org/fdroid/fdroid/FDroidApp.java rename to app/src/main/java/org/fdroid/fdroid/FDroidApp.java index 9db97b91d..df06334e8 100644 --- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java +++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java @@ -206,6 +206,9 @@ public class FDroidApp extends Application { // the database is locked due to the database updater. InstalledAppCacheUpdater.updateInBackground(getApplicationContext()); + // make sure the current proxy stuff is configured + Preferences.get().configureProxy(); + // If the user changes the preference to do with filtering rooted apps, // it is easier to just notify a change in the app provider, // so that the newly updated list will correctly filter relevant apps. diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java b/app/src/main/java/org/fdroid/fdroid/FDroidCertPins.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java rename to app/src/main/java/org/fdroid/fdroid/FDroidCertPins.java diff --git a/F-Droid/src/org/fdroid/fdroid/Hasher.java b/app/src/main/java/org/fdroid/fdroid/Hasher.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/Hasher.java rename to app/src/main/java/org/fdroid/fdroid/Hasher.java diff --git a/F-Droid/src/org/fdroid/fdroid/NfcHelper.java b/app/src/main/java/org/fdroid/fdroid/NfcHelper.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/NfcHelper.java rename to app/src/main/java/org/fdroid/fdroid/NfcHelper.java diff --git a/F-Droid/src/org/fdroid/fdroid/NfcNotEnabledActivity.java b/app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/NfcNotEnabledActivity.java rename to app/src/main/java/org/fdroid/fdroid/NfcNotEnabledActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/Permission.java b/app/src/main/java/org/fdroid/fdroid/Permission.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/Permission.java rename to app/src/main/java/org/fdroid/fdroid/Permission.java diff --git a/F-Droid/src/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java similarity index 95% rename from F-Droid/src/org/fdroid/fdroid/Preferences.java rename to app/src/main/java/org/fdroid/fdroid/Preferences.java index ed9bc4df1..c436694a2 100644 --- a/F-Droid/src/org/fdroid/fdroid/Preferences.java +++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java @@ -6,6 +6,9 @@ import android.os.Build; import android.preference.PreferenceManager; import android.util.Log; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.SocketAddress; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -14,6 +17,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import info.guardianproject.netcipher.NetCipher; + /** * Handles shared preferences for FDroid, looking after the names of * preferences, default values and caching. Needs to be setup in the FDroidApp @@ -178,6 +183,18 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh return preferences.getBoolean(PREF_ENABLE_PROXY, DEFAULT_ENABLE_PROXY); } + /** + * Configure the proxy settings based on whether its enabled and set up. This must be + * run once at app startup, then whenever any of these settings changes. + */ + public void configureProxy() { + if (isProxyEnabled()) { + // if "Use Tor" is set, NetCipher will ignore these proxy settings + SocketAddress sa = new InetSocketAddress(getProxyHost(), getProxyPort()); + NetCipher.setProxy(new Proxy(Proxy.Type.HTTP, sa)); + } + } + public String getProxyHost() { return preferences.getString(PREF_PROXY_HOST, DEFAULT_PROXY_HOST); } diff --git a/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java b/app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java rename to app/src/main/java/org/fdroid/fdroid/PreferencesActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java b/app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/ProgressBufferedInputStream.java rename to app/src/main/java/org/fdroid/fdroid/ProgressBufferedInputStream.java diff --git a/F-Droid/src/org/fdroid/fdroid/ProgressListener.java b/app/src/main/java/org/fdroid/fdroid/ProgressListener.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/ProgressListener.java rename to app/src/main/java/org/fdroid/fdroid/ProgressListener.java diff --git a/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java b/app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java rename to app/src/main/java/org/fdroid/fdroid/QrGenAsyncTask.java diff --git a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java b/app/src/main/java/org/fdroid/fdroid/RepoUpdater.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/RepoUpdater.java rename to app/src/main/java/org/fdroid/fdroid/RepoUpdater.java diff --git a/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java rename to app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/UpdateService.java rename to app/src/main/java/org/fdroid/fdroid/UpdateService.java diff --git a/F-Droid/src/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/Utils.java rename to app/src/main/java/org/fdroid/fdroid/Utils.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/ArrayAdapterCompat.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java rename to app/src/main/java/org/fdroid/fdroid/compat/ArrayAdapterCompat.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java rename to app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java b/app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java rename to app/src/main/java/org/fdroid/fdroid/compat/Compatibility.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/FileCompat.java rename to app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java b/app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java rename to app/src/main/java/org/fdroid/fdroid/compat/PRNGFixes.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java rename to app/src/main/java/org/fdroid/fdroid/compat/PackageManagerCompat.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java rename to app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java b/app/src/main/java/org/fdroid/fdroid/compat/TabManager.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/TabManager.java rename to app/src/main/java/org/fdroid/fdroid/compat/TabManager.java diff --git a/F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/UriCompat.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/compat/UriCompat.java rename to app/src/main/java/org/fdroid/fdroid/compat/UriCompat.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/Apk.java b/app/src/main/java/org/fdroid/fdroid/data/Apk.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/Apk.java rename to app/src/main/java/org/fdroid/fdroid/data/Apk.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/App.java rename to app/src/main/java/org/fdroid/fdroid/data/App.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/AppProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/AppProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/AppProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/Credentials.java b/app/src/main/java/org/fdroid/fdroid/data/Credentials.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/Credentials.java rename to app/src/main/java/org/fdroid/fdroid/data/Credentials.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/DBHelper.java rename to app/src/main/java/org/fdroid/fdroid/data/DBHelper.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java b/app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/FDroidProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java rename to app/src/main/java/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/InstalledAppProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java rename to app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/QueryBuilder.java b/app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/QueryBuilder.java rename to app/src/main/java/org/fdroid/fdroid/data/QueryBuilder.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java b/app/src/main/java/org/fdroid/fdroid/data/QuerySelection.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java rename to app/src/main/java/org/fdroid/fdroid/data/QuerySelection.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/Repo.java b/app/src/main/java/org/fdroid/fdroid/data/Repo.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/Repo.java rename to app/src/main/java/org/fdroid/fdroid/data/Repo.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java rename to app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/SanitizedFile.java b/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/SanitizedFile.java rename to app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/TempApkProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java b/app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java rename to app/src/main/java/org/fdroid/fdroid/data/TempAppProvider.java diff --git a/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java b/app/src/main/java/org/fdroid/fdroid/data/ValueObject.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/data/ValueObject.java rename to app/src/main/java/org/fdroid/fdroid/data/ValueObject.java diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java rename to app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java diff --git a/F-Droid/src/org/fdroid/fdroid/installer/DefaultSdk14Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultSdk14Installer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/installer/DefaultSdk14Installer.java rename to app/src/main/java/org/fdroid/fdroid/installer/DefaultSdk14Installer.java diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/installer/Installer.java rename to app/src/main/java/org/fdroid/fdroid/installer/Installer.java diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java rename to app/src/main/java/org/fdroid/fdroid/installer/PrivilegedInstaller.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/SwapService.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/Peer.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/PeerFinder.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/peers/WifiPeer.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java b/app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/type/SwapType.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java b/app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/localrepo/type/WifiSwap.java rename to app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/ApkDownloader.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java rename to app/src/main/java/org/fdroid/fdroid/net/AsyncDownloadWrapper.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/AsyncDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/AsyncDownloader.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java b/app/src/main/java/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java rename to app/src/main/java/org/fdroid/fdroid/net/AsyncDownloaderFromAndroid.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java similarity index 94% rename from F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java index cf38c1d2a..63c125f44 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/BluetoothDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/BluetoothDownloader.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.net; -import android.content.Context; import android.support.annotation.Nullable; import android.util.Log; @@ -25,8 +24,8 @@ public class BluetoothDownloader extends Downloader { private FileDetails fileDetails; private final String sourcePath; - public BluetoothDownloader(Context context, String macAddress, URL sourceUrl, File destFile) throws IOException { - super(context, sourceUrl, destFile); + public BluetoothDownloader(String macAddress, URL sourceUrl, File destFile) throws IOException { + super(sourceUrl, destFile); this.connection = new BluetoothClient(macAddress).openConnection(); this.sourcePath = sourceUrl.getPath(); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java similarity index 93% rename from F-Droid/src/org/fdroid/fdroid/net/Downloader.java rename to app/src/main/java/org/fdroid/fdroid/net/Downloader.java index 24e96af71..b66dcc7ec 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/Downloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/Downloader.java @@ -1,9 +1,6 @@ package org.fdroid.fdroid.net; -import android.content.Context; -import android.content.Intent; import android.support.annotation.NonNull; -import android.support.v4.content.LocalBroadcastManager; import org.fdroid.fdroid.Utils; @@ -28,7 +25,6 @@ public abstract class Downloader { private final OutputStream outputStream; - private final LocalBroadcastManager localBroadcastManager; private final File outputFile; protected final URL sourceUrl; @@ -36,22 +32,31 @@ public abstract class Downloader { private int bytesRead; private int totalBytes; + interface DownloaderProgressListener { + void sendProgress(URL sourceUrl, int bytesRead, int totalBytes); + } + + private DownloaderProgressListener downloaderProgressListener; + protected abstract InputStream getDownloadersInputStream() throws IOException; protected abstract void close() throws IOException; - Downloader(Context context, URL url, File destFile) + Downloader(URL url, File destFile) throws FileNotFoundException, MalformedURLException { this.sourceUrl = url; outputFile = destFile; outputStream = new FileOutputStream(outputFile); - localBroadcastManager = LocalBroadcastManager.getInstance(context); } public final InputStream getInputStream() throws IOException { return new WrappedInputStream(getDownloadersInputStream()); } + public void setListener(DownloaderProgressListener listener) { + this.downloaderProgressListener = listener; + } + /** * If you ask for the cacheTag before calling download(), you will get the * same one you passed in (if any). If you call it after download(), you @@ -188,11 +193,9 @@ public abstract class Downloader { private void sendProgress(int bytesRead, int totalBytes) { this.bytesRead = bytesRead; - Intent intent = new Intent(LOCAL_ACTION_PROGRESS); - intent.putExtra(EXTRA_ADDRESS, sourceUrl.toString()); - intent.putExtra(EXTRA_BYTES_READ, bytesRead); - intent.putExtra(EXTRA_TOTAL_BYTES, totalBytes); - localBroadcastManager.sendBroadcast(intent); + if (downloaderProgressListener != null) { + downloaderProgressListener.sendProgress(sourceUrl, bytesRead, totalBytes); + } } public int getBytesRead() { diff --git a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java similarity index 80% rename from F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java rename to app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java index fa012d59f..2ac93be4d 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderFactory.java @@ -3,8 +3,10 @@ package org.fdroid.fdroid.net; import android.annotation.TargetApi; import android.app.DownloadManager; import android.content.Context; +import android.content.Intent; import android.database.Cursor; import android.os.Build; +import android.support.v4.content.LocalBroadcastManager; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Credentials; @@ -14,9 +16,10 @@ import java.io.IOException; import java.net.URL; public class DownloaderFactory { - private static final String TAG = "DownloaderFactory"; + private static LocalBroadcastManager localBroadcastManager; + /** * Downloads to a temporary file, which *you must delete yourself when * you are done. It is stored in {@link Context#getCacheDir()} and starts @@ -51,14 +54,31 @@ public class DownloaderFactory { public static Downloader create(Context context, URL url, File destFile, Credentials credentials) throws IOException { + Downloader downloader = null; + if (localBroadcastManager == null) { + localBroadcastManager = LocalBroadcastManager.getInstance(context); + } + if (isBluetoothAddress(url)) { String macAddress = url.getHost().replace("-", ":"); - return new BluetoothDownloader(context, macAddress, url, destFile); + downloader = new BluetoothDownloader(macAddress, url, destFile); + } else if (isLocalFile(url)) { + downloader = new LocalFileDownloader(url, destFile); + } else { + downloader = new HttpDownloader(url, destFile, credentials); } - if (isLocalFile(url)) { - return new LocalFileDownloader(context, url, destFile); - } - return new HttpDownloader(context, url, destFile, credentials); + + downloader.setListener(new Downloader.DownloaderProgressListener() { + @Override + public void sendProgress(URL sourceUrl, int bytesRead, int totalBytes) { + Intent intent = new Intent(Downloader.LOCAL_ACTION_PROGRESS); + intent.putExtra(Downloader.EXTRA_ADDRESS, sourceUrl.toString()); + intent.putExtra(Downloader.EXTRA_BYTES_READ, bytesRead); + intent.putExtra(Downloader.EXTRA_TOTAL_BYTES, totalBytes); + localBroadcastManager.sendBroadcast(intent); + } + }); + return downloader; } private static boolean isBluetoothAddress(URL url) { diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java similarity index 85% rename from F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java index aaaddea13..a7bfac24d 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/HttpDownloader.java @@ -1,13 +1,10 @@ package org.fdroid.fdroid.net; -import android.content.Context; -import android.text.TextUtils; import android.util.Log; import com.nostra13.universalimageloader.core.download.BaseImageDownloader; import org.fdroid.fdroid.FDroidApp; -import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.Credentials; @@ -17,10 +14,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; -import java.net.InetSocketAddress; import java.net.MalformedURLException; -import java.net.Proxy; -import java.net.SocketAddress; import java.net.URL; import javax.net.ssl.HttpsURLConnection; @@ -38,14 +32,14 @@ public class HttpDownloader extends Downloader { private Credentials credentials; private int statusCode = -1; - HttpDownloader(Context context, URL url, File destFile) + HttpDownloader(URL url, File destFile) throws FileNotFoundException, MalformedURLException { - this(context, url, destFile, null); + this(url, destFile, null); } - HttpDownloader(Context context, URL url, File destFile, final Credentials credentials) + HttpDownloader(URL url, File destFile, final Credentials credentials) throws FileNotFoundException, MalformedURLException { - super(context, url, destFile); + super(url, destFile); this.credentials = credentials; } @@ -101,20 +95,14 @@ public class HttpDownloader extends Downloader { // swap never works with a proxy, its unrouted IP on the same subnet connection = (HttpURLConnection) sourceUrl.openConnection(); } else { - Preferences prefs = Preferences.get(); - if (prefs.isProxyEnabled()) { - // if "Use Tor" is set, NetCipher will ignore these proxy settings - SocketAddress sa = new InetSocketAddress(prefs.getProxyHost(), prefs.getProxyPort()); - NetCipher.setProxy(new Proxy(Proxy.Type.HTTP, sa)); - } connection = NetCipher.getHttpURLConnection(sourceUrl); } // workaround until NetCipher supports HTTPS SNI // https://gitlab.com/fdroid/fdroidclient/issues/431 if (connection instanceof HttpsURLConnection - && !TextUtils.equals(sourceUrl.getHost(), "f-droid.org") - && !TextUtils.equals(sourceUrl.getHost(), "guardianproject.info")) { + && "f-droid.org".equals(sourceUrl.getHost()) + && "guardianproject.info".equals(sourceUrl.getHost())) { ((HttpsURLConnection) connection).setSSLSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory()); } diff --git a/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/IconDownloader.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalFileDownloader.java b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java similarity index 83% rename from F-Droid/src/org/fdroid/fdroid/net/LocalFileDownloader.java rename to app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java index 3189c1740..ecd23ae86 100644 --- a/F-Droid/src/org/fdroid/fdroid/net/LocalFileDownloader.java +++ b/app/src/main/java/org/fdroid/fdroid/net/LocalFileDownloader.java @@ -1,7 +1,5 @@ package org.fdroid.fdroid.net; -import android.content.Context; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -12,8 +10,8 @@ import java.net.URL; public class LocalFileDownloader extends Downloader { - LocalFileDownloader(Context context, URL url, File destFile) throws FileNotFoundException, MalformedURLException { - super(context, url, destFile); + LocalFileDownloader(URL url, File destFile) throws FileNotFoundException, MalformedURLException { + super(url, destFile); } private File getFileToDownload() { diff --git a/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java rename to app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java rename to app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java b/app/src/main/java/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java rename to app/src/main/java/org/fdroid/fdroid/net/auth/HttpBasicCredentials.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConstants.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/FileDetails.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/FileDetails.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/FileDetails.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/UnexpectedResponseException.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/UnexpectedResponseException.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/UnexpectedResponseException.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/UnexpectedResponseException.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Request.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Request.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/Response.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/Response.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ContentLengthHeader.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/ETagHeader.java diff --git a/F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java rename to app/src/main/java/org/fdroid/fdroid/net/bluetooth/httpish/headers/Header.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java rename to app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtension.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java rename to app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionBootReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java rename to app/src/main/java/org/fdroid/fdroid/privileged/install/InstallExtensionDialogActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/views/AppDiff.java rename to app/src/main/java/org/fdroid/fdroid/privileged/views/AppDiff.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java rename to app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java rename to app/src/main/java/org/fdroid/fdroid/privileged/views/CaffeinatedScrollView.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java rename to app/src/main/java/org/fdroid/fdroid/privileged/views/InstallConfirmActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/privileged/views/TabsAdapter.java rename to app/src/main/java/org/fdroid/fdroid/privileged/views/TabsAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/DownloadManagerReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/DownloadManagerReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/DownloadManagerReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/DownloadManagerReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/PackageAddedReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/PackageAddedReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/PackageReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/PackageReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java rename to app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/AppListAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/AvailableAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/AvailableAppListAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/AvailableAppListAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/InstalledAppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/InstalledAppListAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/InstalledAppListAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java rename to app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java rename to app/src/main/java/org/fdroid/fdroid/views/RepoAdapter.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java rename to app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java rename to app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java rename to app/src/main/java/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java rename to app/src/main/java/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java rename to app/src/main/java/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java similarity index 99% rename from F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java rename to app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index 576aaafa7..c6007348e 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -317,6 +317,7 @@ public class PreferencesFragment extends PreferenceFragment public void onPause() { super.onPause(); getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this); + Preferences.get().configureProxy(); } @Override diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceive.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/InitialLoadingView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/NfcView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/SwapConnecting.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java similarity index 100% rename from F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrView.java rename to app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java diff --git a/F-Droid/src/sun/net/www/protocol/bluetooth/Handler.java b/app/src/main/java/sun/net/www/protocol/bluetooth/Handler.java similarity index 100% rename from F-Droid/src/sun/net/www/protocol/bluetooth/Handler.java rename to app/src/main/java/sun/net/www/protocol/bluetooth/Handler.java diff --git a/F-Droid/res/drawable-hdpi/circle.png b/app/src/main/res/drawable-hdpi/circle.png similarity index 100% rename from F-Droid/res/drawable-hdpi/circle.png rename to app/src/main/res/drawable-hdpi/circle.png diff --git a/F-Droid/res/drawable-hdpi/hotspot.png b/app/src/main/res/drawable-hdpi/hotspot.png similarity index 100% rename from F-Droid/res/drawable-hdpi/hotspot.png rename to app/src/main/res/drawable-hdpi/hotspot.png diff --git a/F-Droid/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_add_circle_outline_white.png rename to app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_add_white.png b/app/src/main/res/drawable-hdpi/ic_add_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_add_white.png rename to app/src/main/res/drawable-hdpi/ic_add_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_arrow_forward_white.png rename to app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_bitcoin.png b/app/src/main/res/drawable-hdpi/ic_bitcoin.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_bitcoin.png rename to app/src/main/res/drawable-hdpi/ic_bitcoin.png diff --git a/F-Droid/res/drawable-hdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_bluetooth_white.png rename to app/src/main/res/drawable-hdpi/ic_bluetooth_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_changelog.png b/app/src/main/res/drawable-hdpi/ic_changelog.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_changelog.png rename to app/src/main/res/drawable-hdpi/ic_changelog.png diff --git a/F-Droid/res/drawable-hdpi/ic_check_circle_white.png b/app/src/main/res/drawable-hdpi/ic_check_circle_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_check_circle_white.png rename to app/src/main/res/drawable-hdpi/ic_check_circle_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_clear.png b/app/src/main/res/drawable-hdpi/ic_clear.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_clear.png rename to app/src/main/res/drawable-hdpi/ic_clear.png diff --git a/F-Droid/res/drawable-hdpi/ic_close_white.png b/app/src/main/res/drawable-hdpi/ic_close_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_close_white.png rename to app/src/main/res/drawable-hdpi/ic_close_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_coins_s.png b/app/src/main/res/drawable-hdpi/ic_coins_s.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_coins_s.png rename to app/src/main/res/drawable-hdpi/ic_coins_s.png diff --git a/F-Droid/res/drawable-hdpi/ic_delete_white.png b/app/src/main/res/drawable-hdpi/ic_delete_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_delete_white.png rename to app/src/main/res/drawable-hdpi/ic_delete_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_do_not_disturb_white.png rename to app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_donate.png b/app/src/main/res/drawable-hdpi/ic_donate.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_donate.png rename to app/src/main/res/drawable-hdpi/ic_donate.png diff --git a/F-Droid/res/drawable-hdpi/ic_email.png b/app/src/main/res/drawable-hdpi/ic_email.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_email.png rename to app/src/main/res/drawable-hdpi/ic_email.png diff --git a/F-Droid/res/drawable-hdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_expand_less_grey600.png rename to app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png diff --git a/F-Droid/res/drawable-hdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_expand_more_grey600.png rename to app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png diff --git a/F-Droid/res/drawable-hdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-hdpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-hdpi/ic_flattr.png b/app/src/main/res/drawable-hdpi/ic_flattr.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_flattr.png rename to app/src/main/res/drawable-hdpi/ic_flattr.png diff --git a/F-Droid/res/drawable-hdpi/ic_help_white.png b/app/src/main/res/drawable-hdpi/ic_help_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_help_white.png rename to app/src/main/res/drawable-hdpi/ic_help_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_issues.png b/app/src/main/res/drawable-hdpi/ic_issues.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_issues.png rename to app/src/main/res/drawable-hdpi/ic_issues.png diff --git a/F-Droid/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/F-Droid/res/drawable-hdpi/ic_litecoin.png b/app/src/main/res/drawable-hdpi/ic_litecoin.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_litecoin.png rename to app/src/main/res/drawable-hdpi/ic_litecoin.png diff --git a/F-Droid/res/drawable-hdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_lock_24dp_grey600.png rename to app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-hdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_network_wifi_white.png rename to app/src/main/res/drawable-hdpi/ic_network_wifi_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_nfc_white.png b/app/src/main/res/drawable-hdpi/ic_nfc_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_nfc_white.png rename to app/src/main/res/drawable-hdpi/ic_nfc_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_play_arrow_white.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_play_arrow_white.png rename to app/src/main/res/drawable-hdpi/ic_play_arrow_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_qr_grey.png b/app/src/main/res/drawable-hdpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_qr_grey.png rename to app/src/main/res/drawable-hdpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-hdpi/ic_refresh_white.png b/app/src/main/res/drawable-hdpi/ic_refresh_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_refresh_white.png rename to app/src/main/res/drawable-hdpi/ic_refresh_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_repo_app_default.png b/app/src/main/res/drawable-hdpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_repo_app_default.png rename to app/src/main/res/drawable-hdpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-hdpi/ic_search_white.png b/app/src/main/res/drawable-hdpi/ic_search_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_search_white.png rename to app/src/main/res/drawable-hdpi/ic_search_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_settings_white.png b/app/src/main/res/drawable-hdpi/ic_settings_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_settings_white.png rename to app/src/main/res/drawable-hdpi/ic_settings_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_share_white.png b/app/src/main/res/drawable-hdpi/ic_share_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_share_white.png rename to app/src/main/res/drawable-hdpi/ic_share_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_source_code.png b/app/src/main/res/drawable-hdpi/ic_source_code.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_source_code.png rename to app/src/main/res/drawable-hdpi/ic_source_code.png diff --git a/F-Droid/res/drawable-hdpi/ic_stat_notify.png b/app/src/main/res/drawable-hdpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_stat_notify.png rename to app/src/main/res/drawable-hdpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-hdpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-hdpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-hdpi/ic_swap.png b/app/src/main/res/drawable-hdpi/ic_swap.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_swap.png rename to app/src/main/res/drawable-hdpi/ic_swap.png diff --git a/F-Droid/res/drawable-hdpi/ic_toc_white.png b/app/src/main/res/drawable-hdpi/ic_toc_white.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_toc_white.png rename to app/src/main/res/drawable-hdpi/ic_toc_white.png diff --git a/F-Droid/res/drawable-hdpi/ic_website.png b/app/src/main/res/drawable-hdpi/ic_website.png similarity index 100% rename from F-Droid/res/drawable-hdpi/ic_website.png rename to app/src/main/res/drawable-hdpi/ic_website.png diff --git a/F-Droid/res/drawable-hdpi/nfc_touch.png b/app/src/main/res/drawable-hdpi/nfc_touch.png similarity index 100% rename from F-Droid/res/drawable-hdpi/nfc_touch.png rename to app/src/main/res/drawable-hdpi/nfc_touch.png diff --git a/F-Droid/res/drawable-hdpi/swap_start_header.png b/app/src/main/res/drawable-hdpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-hdpi/swap_start_header.png rename to app/src/main/res/drawable-hdpi/swap_start_header.png diff --git a/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png b/app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png similarity index 100% rename from F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png rename to app/src/main/res/drawable-hdpi/tab_unselected_holo.9.png diff --git a/F-Droid/res/drawable-hdpi/wifi.png b/app/src/main/res/drawable-hdpi/wifi.png similarity index 100% rename from F-Droid/res/drawable-hdpi/wifi.png rename to app/src/main/res/drawable-hdpi/wifi.png diff --git a/F-Droid/res/drawable-ldpi/circle.png b/app/src/main/res/drawable-ldpi/circle.png similarity index 100% rename from F-Droid/res/drawable-ldpi/circle.png rename to app/src/main/res/drawable-ldpi/circle.png diff --git a/F-Droid/res/drawable-ldpi/hotspot.png b/app/src/main/res/drawable-ldpi/hotspot.png similarity index 100% rename from F-Droid/res/drawable-ldpi/hotspot.png rename to app/src/main/res/drawable-ldpi/hotspot.png diff --git a/F-Droid/res/drawable-ldpi/ic_fdroid_grey.png b/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-ldpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_launcher.png rename to app/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/F-Droid/res/drawable-ldpi/ic_qr_grey.png b/app/src/main/res/drawable-ldpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_qr_grey.png rename to app/src/main/res/drawable-ldpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-ldpi/ic_repo_app_default.png b/app/src/main/res/drawable-ldpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_repo_app_default.png rename to app/src/main/res/drawable-ldpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-ldpi/ic_stat_notify.png b/app/src/main/res/drawable-ldpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_stat_notify.png rename to app/src/main/res/drawable-ldpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-ldpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-ldpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-ldpi/ic_swap.png b/app/src/main/res/drawable-ldpi/ic_swap.png similarity index 100% rename from F-Droid/res/drawable-ldpi/ic_swap.png rename to app/src/main/res/drawable-ldpi/ic_swap.png diff --git a/F-Droid/res/drawable-ldpi/nfc_touch.png b/app/src/main/res/drawable-ldpi/nfc_touch.png similarity index 100% rename from F-Droid/res/drawable-ldpi/nfc_touch.png rename to app/src/main/res/drawable-ldpi/nfc_touch.png diff --git a/F-Droid/res/drawable-ldpi/swap_start_header.png b/app/src/main/res/drawable-ldpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-ldpi/swap_start_header.png rename to app/src/main/res/drawable-ldpi/swap_start_header.png diff --git a/F-Droid/res/drawable-ldpi/wifi.png b/app/src/main/res/drawable-ldpi/wifi.png similarity index 100% rename from F-Droid/res/drawable-ldpi/wifi.png rename to app/src/main/res/drawable-ldpi/wifi.png diff --git a/F-Droid/res/drawable-mdpi/circle.png b/app/src/main/res/drawable-mdpi/circle.png similarity index 100% rename from F-Droid/res/drawable-mdpi/circle.png rename to app/src/main/res/drawable-mdpi/circle.png diff --git a/F-Droid/res/drawable-mdpi/hotspot.png b/app/src/main/res/drawable-mdpi/hotspot.png similarity index 100% rename from F-Droid/res/drawable-mdpi/hotspot.png rename to app/src/main/res/drawable-mdpi/hotspot.png diff --git a/F-Droid/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_add_circle_outline_white.png rename to app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_add_white.png b/app/src/main/res/drawable-mdpi/ic_add_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_add_white.png rename to app/src/main/res/drawable-mdpi/ic_add_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_arrow_forward_white.png rename to app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_bitcoin.png b/app/src/main/res/drawable-mdpi/ic_bitcoin.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_bitcoin.png rename to app/src/main/res/drawable-mdpi/ic_bitcoin.png diff --git a/F-Droid/res/drawable-mdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_bluetooth_white.png rename to app/src/main/res/drawable-mdpi/ic_bluetooth_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_changelog.png b/app/src/main/res/drawable-mdpi/ic_changelog.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_changelog.png rename to app/src/main/res/drawable-mdpi/ic_changelog.png diff --git a/F-Droid/res/drawable-mdpi/ic_check_circle_white.png b/app/src/main/res/drawable-mdpi/ic_check_circle_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_check_circle_white.png rename to app/src/main/res/drawable-mdpi/ic_check_circle_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_clear.png b/app/src/main/res/drawable-mdpi/ic_clear.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_clear.png rename to app/src/main/res/drawable-mdpi/ic_clear.png diff --git a/F-Droid/res/drawable-mdpi/ic_close_white.png b/app/src/main/res/drawable-mdpi/ic_close_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_close_white.png rename to app/src/main/res/drawable-mdpi/ic_close_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_coins_s.png b/app/src/main/res/drawable-mdpi/ic_coins_s.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_coins_s.png rename to app/src/main/res/drawable-mdpi/ic_coins_s.png diff --git a/F-Droid/res/drawable-mdpi/ic_delete_white.png b/app/src/main/res/drawable-mdpi/ic_delete_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_delete_white.png rename to app/src/main/res/drawable-mdpi/ic_delete_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_do_not_disturb_white.png rename to app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_donate.png b/app/src/main/res/drawable-mdpi/ic_donate.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_donate.png rename to app/src/main/res/drawable-mdpi/ic_donate.png diff --git a/F-Droid/res/drawable-mdpi/ic_email.png b/app/src/main/res/drawable-mdpi/ic_email.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_email.png rename to app/src/main/res/drawable-mdpi/ic_email.png diff --git a/F-Droid/res/drawable-mdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_expand_less_grey600.png rename to app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png diff --git a/F-Droid/res/drawable-mdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_expand_more_grey600.png rename to app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png diff --git a/F-Droid/res/drawable-mdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-mdpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-mdpi/ic_flattr.png b/app/src/main/res/drawable-mdpi/ic_flattr.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_flattr.png rename to app/src/main/res/drawable-mdpi/ic_flattr.png diff --git a/F-Droid/res/drawable-mdpi/ic_help_white.png b/app/src/main/res/drawable-mdpi/ic_help_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_help_white.png rename to app/src/main/res/drawable-mdpi/ic_help_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_issues.png b/app/src/main/res/drawable-mdpi/ic_issues.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_issues.png rename to app/src/main/res/drawable-mdpi/ic_issues.png diff --git a/F-Droid/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/F-Droid/res/drawable-mdpi/ic_litecoin.png b/app/src/main/res/drawable-mdpi/ic_litecoin.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_litecoin.png rename to app/src/main/res/drawable-mdpi/ic_litecoin.png diff --git a/F-Droid/res/drawable-mdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_lock_24dp_grey600.png rename to app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-mdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_network_wifi_white.png rename to app/src/main/res/drawable-mdpi/ic_network_wifi_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_nfc_white.png b/app/src/main/res/drawable-mdpi/ic_nfc_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_nfc_white.png rename to app/src/main/res/drawable-mdpi/ic_nfc_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_play_arrow_white.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_play_arrow_white.png rename to app/src/main/res/drawable-mdpi/ic_play_arrow_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_qr_grey.png b/app/src/main/res/drawable-mdpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_qr_grey.png rename to app/src/main/res/drawable-mdpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-mdpi/ic_refresh_white.png b/app/src/main/res/drawable-mdpi/ic_refresh_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_refresh_white.png rename to app/src/main/res/drawable-mdpi/ic_refresh_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_repo_app_default.png b/app/src/main/res/drawable-mdpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_repo_app_default.png rename to app/src/main/res/drawable-mdpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_search_white.png rename to app/src/main/res/drawable-mdpi/ic_search_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_settings_white.png b/app/src/main/res/drawable-mdpi/ic_settings_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_settings_white.png rename to app/src/main/res/drawable-mdpi/ic_settings_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_share_white.png rename to app/src/main/res/drawable-mdpi/ic_share_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_source_code.png b/app/src/main/res/drawable-mdpi/ic_source_code.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_source_code.png rename to app/src/main/res/drawable-mdpi/ic_source_code.png diff --git a/F-Droid/res/drawable-mdpi/ic_stat_notify.png b/app/src/main/res/drawable-mdpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_stat_notify.png rename to app/src/main/res/drawable-mdpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-mdpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-mdpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-mdpi/ic_swap.png b/app/src/main/res/drawable-mdpi/ic_swap.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_swap.png rename to app/src/main/res/drawable-mdpi/ic_swap.png diff --git a/F-Droid/res/drawable-mdpi/ic_toc_white.png b/app/src/main/res/drawable-mdpi/ic_toc_white.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_toc_white.png rename to app/src/main/res/drawable-mdpi/ic_toc_white.png diff --git a/F-Droid/res/drawable-mdpi/ic_website.png b/app/src/main/res/drawable-mdpi/ic_website.png similarity index 100% rename from F-Droid/res/drawable-mdpi/ic_website.png rename to app/src/main/res/drawable-mdpi/ic_website.png diff --git a/F-Droid/res/drawable-mdpi/nfc_touch.png b/app/src/main/res/drawable-mdpi/nfc_touch.png similarity index 100% rename from F-Droid/res/drawable-mdpi/nfc_touch.png rename to app/src/main/res/drawable-mdpi/nfc_touch.png diff --git a/F-Droid/res/drawable-mdpi/swap_start_header.png b/app/src/main/res/drawable-mdpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-mdpi/swap_start_header.png rename to app/src/main/res/drawable-mdpi/swap_start_header.png diff --git a/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png b/app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png similarity index 100% rename from F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png rename to app/src/main/res/drawable-mdpi/tab_unselected_holo.9.png diff --git a/F-Droid/res/drawable-mdpi/wifi.png b/app/src/main/res/drawable-mdpi/wifi.png similarity index 100% rename from F-Droid/res/drawable-mdpi/wifi.png rename to app/src/main/res/drawable-mdpi/wifi.png diff --git a/F-Droid/res/drawable-xhdpi/circle.png b/app/src/main/res/drawable-xhdpi/circle.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/circle.png rename to app/src/main/res/drawable-xhdpi/circle.png diff --git a/F-Droid/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_add_circle_outline_white.png rename to app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_add_white.png b/app/src/main/res/drawable-xhdpi/ic_add_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_add_white.png rename to app/src/main/res/drawable-xhdpi/ic_add_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_arrow_forward_white.png rename to app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_bitcoin.png b/app/src/main/res/drawable-xhdpi/ic_bitcoin.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_bitcoin.png rename to app/src/main/res/drawable-xhdpi/ic_bitcoin.png diff --git a/F-Droid/res/drawable-xhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_bluetooth_white.png rename to app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_changelog.png b/app/src/main/res/drawable-xhdpi/ic_changelog.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_changelog.png rename to app/src/main/res/drawable-xhdpi/ic_changelog.png diff --git a/F-Droid/res/drawable-xhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_check_circle_white.png rename to app/src/main/res/drawable-xhdpi/ic_check_circle_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_clear.png b/app/src/main/res/drawable-xhdpi/ic_clear.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_clear.png rename to app/src/main/res/drawable-xhdpi/ic_clear.png diff --git a/F-Droid/res/drawable-xhdpi/ic_close_white.png b/app/src/main/res/drawable-xhdpi/ic_close_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_close_white.png rename to app/src/main/res/drawable-xhdpi/ic_close_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_coins_s.png b/app/src/main/res/drawable-xhdpi/ic_coins_s.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_coins_s.png rename to app/src/main/res/drawable-xhdpi/ic_coins_s.png diff --git a/F-Droid/res/drawable-xhdpi/ic_delete_white.png b/app/src/main/res/drawable-xhdpi/ic_delete_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_delete_white.png rename to app/src/main/res/drawable-xhdpi/ic_delete_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_do_not_disturb_white.png rename to app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_donate.png b/app/src/main/res/drawable-xhdpi/ic_donate.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_donate.png rename to app/src/main/res/drawable-xhdpi/ic_donate.png diff --git a/F-Droid/res/drawable-xhdpi/ic_email.png b/app/src/main/res/drawable-xhdpi/ic_email.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_email.png rename to app/src/main/res/drawable-xhdpi/ic_email.png diff --git a/F-Droid/res/drawable-xhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_expand_less_grey600.png rename to app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png diff --git a/F-Droid/res/drawable-xhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_expand_more_grey600.png rename to app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png diff --git a/F-Droid/res/drawable-xhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-xhdpi/ic_flattr.png b/app/src/main/res/drawable-xhdpi/ic_flattr.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_flattr.png rename to app/src/main/res/drawable-xhdpi/ic_flattr.png diff --git a/F-Droid/res/drawable-xhdpi/ic_help_white.png b/app/src/main/res/drawable-xhdpi/ic_help_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_help_white.png rename to app/src/main/res/drawable-xhdpi/ic_help_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_issues.png b/app/src/main/res/drawable-xhdpi/ic_issues.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_issues.png rename to app/src/main/res/drawable-xhdpi/ic_issues.png diff --git a/F-Droid/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/F-Droid/res/drawable-xhdpi/ic_litecoin.png b/app/src/main/res/drawable-xhdpi/ic_litecoin.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_litecoin.png rename to app/src/main/res/drawable-xhdpi/ic_litecoin.png diff --git a/F-Droid/res/drawable-xhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_lock_24dp_grey600.png rename to app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-xhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_network_wifi_white.png rename to app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xhdpi/ic_nfc_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_nfc_white.png rename to app/src/main/res/drawable-xhdpi/ic_nfc_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_play_arrow_white.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_play_arrow_white.png rename to app/src/main/res/drawable-xhdpi/ic_play_arrow_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xhdpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_qr_grey.png rename to app/src/main/res/drawable-xhdpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-xhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xhdpi/ic_refresh_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_refresh_white.png rename to app/src/main/res/drawable-xhdpi/ic_refresh_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xhdpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_repo_app_default.png rename to app/src/main/res/drawable-xhdpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_search_white.png rename to app/src/main/res/drawable-xhdpi/ic_search_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_settings_white.png b/app/src/main/res/drawable-xhdpi/ic_settings_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_settings_white.png rename to app/src/main/res/drawable-xhdpi/ic_settings_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_share_white.png rename to app/src/main/res/drawable-xhdpi/ic_share_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_source_code.png b/app/src/main/res/drawable-xhdpi/ic_source_code.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_source_code.png rename to app/src/main/res/drawable-xhdpi/ic_source_code.png diff --git a/F-Droid/res/drawable-xhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_stat_notify.png rename to app/src/main/res/drawable-xhdpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-xhdpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-xhdpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-xhdpi/ic_swap.png b/app/src/main/res/drawable-xhdpi/ic_swap.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_swap.png rename to app/src/main/res/drawable-xhdpi/ic_swap.png diff --git a/F-Droid/res/drawable-xhdpi/ic_toc_white.png b/app/src/main/res/drawable-xhdpi/ic_toc_white.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_toc_white.png rename to app/src/main/res/drawable-xhdpi/ic_toc_white.png diff --git a/F-Droid/res/drawable-xhdpi/ic_website.png b/app/src/main/res/drawable-xhdpi/ic_website.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/ic_website.png rename to app/src/main/res/drawable-xhdpi/ic_website.png diff --git a/F-Droid/res/drawable-xhdpi/nfc_touch.png b/app/src/main/res/drawable-xhdpi/nfc_touch.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/nfc_touch.png rename to app/src/main/res/drawable-xhdpi/nfc_touch.png diff --git a/F-Droid/res/drawable-xhdpi/swap_start_header.png b/app/src/main/res/drawable-xhdpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/swap_start_header.png rename to app/src/main/res/drawable-xhdpi/swap_start_header.png diff --git a/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png b/app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png rename to app/src/main/res/drawable-xhdpi/tab_unselected_holo.9.png diff --git a/F-Droid/res/drawable-xhdpi/wifi.png b/app/src/main/res/drawable-xhdpi/wifi.png similarity index 100% rename from F-Droid/res/drawable-xhdpi/wifi.png rename to app/src/main/res/drawable-xhdpi/wifi.png diff --git a/F-Droid/res/drawable-xxhdpi/circle.png b/app/src/main/res/drawable-xxhdpi/circle.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/circle.png rename to app/src/main/res/drawable-xxhdpi/circle.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_add_circle_outline_white.png rename to app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_add_white.png rename to app/src/main/res/drawable-xxhdpi/ic_add_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_arrow_forward_white.png rename to app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_bitcoin.png b/app/src/main/res/drawable-xxhdpi/ic_bitcoin.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_bitcoin.png rename to app/src/main/res/drawable-xxhdpi/ic_bitcoin.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_bluetooth_white.png rename to app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxhdpi/ic_changelog.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_changelog.png rename to app/src/main/res/drawable-xxhdpi/ic_changelog.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_check_circle_white.png rename to app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_clear.png b/app/src/main/res/drawable-xxhdpi/ic_clear.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_clear.png rename to app/src/main/res/drawable-xxhdpi/ic_clear.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_close_white.png rename to app/src/main/res/drawable-xxhdpi/ic_close_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_delete_white.png rename to app/src/main/res/drawable-xxhdpi/ic_delete_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_do_not_disturb_white.png rename to app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_donate.png b/app/src/main/res/drawable-xxhdpi/ic_donate.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_donate.png rename to app/src/main/res/drawable-xxhdpi/ic_donate.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_email.png b/app/src/main/res/drawable-xxhdpi/ic_email.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_email.png rename to app/src/main/res/drawable-xxhdpi/ic_email.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_expand_less_grey600.png rename to app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_expand_more_grey600.png rename to app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_flattr.png b/app/src/main/res/drawable-xxhdpi/ic_flattr.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_flattr.png rename to app/src/main/res/drawable-xxhdpi/ic_flattr.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_help_white.png b/app/src/main/res/drawable-xxhdpi/ic_help_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_help_white.png rename to app/src/main/res/drawable-xxhdpi/ic_help_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_issues.png b/app/src/main/res/drawable-xxhdpi/ic_issues.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_issues.png rename to app/src/main/res/drawable-xxhdpi/ic_issues.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_litecoin.png b/app/src/main/res/drawable-xxhdpi/ic_litecoin.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_litecoin.png rename to app/src/main/res/drawable-xxhdpi/ic_litecoin.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_lock_24dp_grey600.png rename to app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_network_wifi_white.png rename to app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_nfc_white.png rename to app/src/main/res/drawable-xxhdpi/ic_nfc_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_play_arrow_white.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_play_arrow_white.png rename to app/src/main/res/drawable-xxhdpi/ic_play_arrow_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_qr_grey.png rename to app/src/main/res/drawable-xxhdpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_refresh_white.png rename to app/src/main/res/drawable-xxhdpi/ic_refresh_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png rename to app/src/main/res/drawable-xxhdpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_search_white.png rename to app/src/main/res/drawable-xxhdpi/ic_search_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_settings_white.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_settings_white.png rename to app/src/main/res/drawable-xxhdpi/ic_settings_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_share_white.png rename to app/src/main/res/drawable-xxhdpi/ic_share_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxhdpi/ic_source_code.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_source_code.png rename to app/src/main/res/drawable-xxhdpi/ic_source_code.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_stat_notify.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-xxhdpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-xxhdpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_toc_white.png b/app/src/main/res/drawable-xxhdpi/ic_toc_white.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_toc_white.png rename to app/src/main/res/drawable-xxhdpi/ic_toc_white.png diff --git a/F-Droid/res/drawable-xxhdpi/ic_website.png b/app/src/main/res/drawable-xxhdpi/ic_website.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/ic_website.png rename to app/src/main/res/drawable-xxhdpi/ic_website.png diff --git a/F-Droid/res/drawable-xxhdpi/swap_start_header.png b/app/src/main/res/drawable-xxhdpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/swap_start_header.png rename to app/src/main/res/drawable-xxhdpi/swap_start_header.png diff --git a/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png b/app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png similarity index 100% rename from F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png rename to app/src/main/res/drawable-xxhdpi/tab_unselected_holo.9.png diff --git a/F-Droid/res/drawable-xxxhdpi/circle.png b/app/src/main/res/drawable-xxxhdpi/circle.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/circle.png rename to app/src/main/res/drawable-xxxhdpi/circle.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_add_circle_outline_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_add_circle_outline_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_add_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_add_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_arrow_forward_white.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_arrow_forward_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_bitcoin.png b/app/src/main/res/drawable-xxxhdpi/ic_bitcoin.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_bitcoin.png rename to app/src/main/res/drawable-xxxhdpi/ic_bitcoin.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_bluetooth_white.png b/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_bluetooth_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxxhdpi/ic_changelog.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_changelog.png rename to app/src/main/res/drawable-xxxhdpi/ic_changelog.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_check_circle_white.png b/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_check_circle_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_clear.png b/app/src/main/res/drawable-xxxhdpi/ic_clear.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_clear.png rename to app/src/main/res/drawable-xxxhdpi/ic_clear.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_close_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_close_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_delete_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_delete_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_do_not_disturb_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_donate.png b/app/src/main/res/drawable-xxxhdpi/ic_donate.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_donate.png rename to app/src/main/res/drawable-xxxhdpi/ic_donate.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_email.png b/app/src/main/res/drawable-xxxhdpi/ic_email.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_email.png rename to app/src/main/res/drawable-xxxhdpi/ic_email.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_expand_less_grey600.png rename to app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_expand_more_grey600.png rename to app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_fdroid_grey.png b/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_fdroid_grey.png rename to app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_flattr.png b/app/src/main/res/drawable-xxxhdpi/ic_flattr.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_flattr.png rename to app/src/main/res/drawable-xxxhdpi/ic_flattr.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_help_white.png b/app/src/main/res/drawable-xxxhdpi/ic_help_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_help_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_help_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_issues.png b/app/src/main/res/drawable-xxxhdpi/ic_issues.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_issues.png rename to app/src/main/res/drawable-xxxhdpi/ic_issues.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_litecoin.png b/app/src/main/res/drawable-xxxhdpi/ic_litecoin.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_litecoin.png rename to app/src/main/res/drawable-xxxhdpi/ic_litecoin.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png rename to app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_network_wifi_white.png b/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_network_wifi_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_nfc_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_play_arrow_white.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_play_arrow_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_qr_grey.png b/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_qr_grey.png rename to app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_refresh_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_repo_app_default.png b/app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_repo_app_default.png rename to app/src/main/res/drawable-xxxhdpi/ic_repo_app_default.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_search_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_search_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_settings_white.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_settings_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_settings_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_share_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_share_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxxhdpi/ic_source_code.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_source_code.png rename to app/src/main/res/drawable-xxxhdpi/ic_source_code.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_stat_notify.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_stat_notify.png rename to app/src/main/res/drawable-xxxhdpi/ic_stat_notify.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_stat_notify_updates.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_notify_updates.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_stat_notify_updates.png rename to app/src/main/res/drawable-xxxhdpi/ic_stat_notify_updates.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_toc_white.png b/app/src/main/res/drawable-xxxhdpi/ic_toc_white.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_toc_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_toc_white.png diff --git a/F-Droid/res/drawable-xxxhdpi/ic_website.png b/app/src/main/res/drawable-xxxhdpi/ic_website.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/ic_website.png rename to app/src/main/res/drawable-xxxhdpi/ic_website.png diff --git a/F-Droid/res/drawable-xxxhdpi/swap_start_header.png b/app/src/main/res/drawable-xxxhdpi/swap_start_header.png similarity index 100% rename from F-Droid/res/drawable-xxxhdpi/swap_start_header.png rename to app/src/main/res/drawable-xxxhdpi/swap_start_header.png diff --git a/F-Droid/res/drawable/swap_qr_example.png b/app/src/main/res/drawable/swap_qr_example.png similarity index 100% rename from F-Droid/res/drawable/swap_qr_example.png rename to app/src/main/res/drawable/swap_qr_example.png diff --git a/F-Droid/res/layout-land/app_details.xml b/app/src/main/res/layout-land/app_details.xml similarity index 100% rename from F-Droid/res/layout-land/app_details.xml rename to app/src/main/res/layout-land/app_details.xml diff --git a/F-Droid/res/layout-v11/app_permission_item.xml b/app/src/main/res/layout-v11/app_permission_item.xml similarity index 100% rename from F-Droid/res/layout-v11/app_permission_item.xml rename to app/src/main/res/layout-v11/app_permission_item.xml diff --git a/F-Droid/res/layout-v11/install_confirm.xml b/app/src/main/res/layout-v11/install_confirm.xml similarity index 100% rename from F-Droid/res/layout-v11/install_confirm.xml rename to app/src/main/res/layout-v11/install_confirm.xml diff --git a/F-Droid/res/layout-v11/select_local_apps_list_item.xml b/app/src/main/res/layout-v11/select_local_apps_list_item.xml similarity index 100% rename from F-Droid/res/layout-v11/select_local_apps_list_item.xml rename to app/src/main/res/layout-v11/select_local_apps_list_item.xml diff --git a/F-Droid/res/layout-v17/app_permission_item_money.xml b/app/src/main/res/layout-v17/app_permission_item_money.xml similarity index 100% rename from F-Droid/res/layout-v17/app_permission_item_money.xml rename to app/src/main/res/layout-v17/app_permission_item_money.xml diff --git a/F-Droid/res/layout-v17/select_local_apps_list_item.xml b/app/src/main/res/layout-v17/select_local_apps_list_item.xml similarity index 100% rename from F-Droid/res/layout-v17/select_local_apps_list_item.xml rename to app/src/main/res/layout-v17/select_local_apps_list_item.xml diff --git a/F-Droid/res/layout/about.xml b/app/src/main/res/layout/about.xml similarity index 100% rename from F-Droid/res/layout/about.xml rename to app/src/main/res/layout/about.xml diff --git a/F-Droid/res/layout/addrepo.xml b/app/src/main/res/layout/addrepo.xml similarity index 100% rename from F-Droid/res/layout/addrepo.xml rename to app/src/main/res/layout/addrepo.xml diff --git a/F-Droid/res/layout/apklistitem.xml b/app/src/main/res/layout/apklistitem.xml similarity index 100% rename from F-Droid/res/layout/apklistitem.xml rename to app/src/main/res/layout/apklistitem.xml diff --git a/F-Droid/res/layout/app_details.xml b/app/src/main/res/layout/app_details.xml similarity index 100% rename from F-Droid/res/layout/app_details.xml rename to app/src/main/res/layout/app_details.xml diff --git a/F-Droid/res/layout/app_details_header.xml b/app/src/main/res/layout/app_details_header.xml similarity index 100% rename from F-Droid/res/layout/app_details_header.xml rename to app/src/main/res/layout/app_details_header.xml diff --git a/F-Droid/res/layout/app_details_summary.xml b/app/src/main/res/layout/app_details_summary.xml similarity index 100% rename from F-Droid/res/layout/app_details_summary.xml rename to app/src/main/res/layout/app_details_summary.xml diff --git a/F-Droid/res/layout/app_permission_item.xml b/app/src/main/res/layout/app_permission_item.xml similarity index 100% rename from F-Droid/res/layout/app_permission_item.xml rename to app/src/main/res/layout/app_permission_item.xml diff --git a/F-Droid/res/layout/app_perms_summary.xml b/app/src/main/res/layout/app_perms_summary.xml similarity index 100% rename from F-Droid/res/layout/app_perms_summary.xml rename to app/src/main/res/layout/app_perms_summary.xml diff --git a/F-Droid/res/layout/applistitem.xml b/app/src/main/res/layout/applistitem.xml similarity index 100% rename from F-Droid/res/layout/applistitem.xml rename to app/src/main/res/layout/applistitem.xml diff --git a/F-Droid/res/layout/available_app_list.xml b/app/src/main/res/layout/available_app_list.xml similarity index 100% rename from F-Droid/res/layout/available_app_list.xml rename to app/src/main/res/layout/available_app_list.xml diff --git a/F-Droid/res/layout/can_update_app_list.xml b/app/src/main/res/layout/can_update_app_list.xml similarity index 100% rename from F-Droid/res/layout/can_update_app_list.xml rename to app/src/main/res/layout/can_update_app_list.xml diff --git a/F-Droid/res/layout/crash_report_dialog.xml b/app/src/main/res/layout/crash_report_dialog.xml similarity index 100% rename from F-Droid/res/layout/crash_report_dialog.xml rename to app/src/main/res/layout/crash_report_dialog.xml diff --git a/F-Droid/res/layout/fdroid.xml b/app/src/main/res/layout/fdroid.xml similarity index 100% rename from F-Droid/res/layout/fdroid.xml rename to app/src/main/res/layout/fdroid.xml diff --git a/F-Droid/res/layout/install_app_details.xml b/app/src/main/res/layout/install_app_details.xml similarity index 100% rename from F-Droid/res/layout/install_app_details.xml rename to app/src/main/res/layout/install_app_details.xml diff --git a/F-Droid/res/layout/install_confirm.xml b/app/src/main/res/layout/install_confirm.xml similarity index 100% rename from F-Droid/res/layout/install_confirm.xml rename to app/src/main/res/layout/install_confirm.xml diff --git a/F-Droid/res/layout/install_start.xml b/app/src/main/res/layout/install_start.xml similarity index 100% rename from F-Droid/res/layout/install_start.xml rename to app/src/main/res/layout/install_start.xml diff --git a/F-Droid/res/layout/installed_app_list.xml b/app/src/main/res/layout/installed_app_list.xml similarity index 100% rename from F-Droid/res/layout/installed_app_list.xml rename to app/src/main/res/layout/installed_app_list.xml diff --git a/F-Droid/res/layout/login.xml b/app/src/main/res/layout/login.xml similarity index 100% rename from F-Droid/res/layout/login.xml rename to app/src/main/res/layout/login.xml diff --git a/F-Droid/res/layout/permissions_list.xml b/app/src/main/res/layout/permissions_list.xml similarity index 100% rename from F-Droid/res/layout/permissions_list.xml rename to app/src/main/res/layout/permissions_list.xml diff --git a/F-Droid/res/layout/repo_item.xml b/app/src/main/res/layout/repo_item.xml similarity index 100% rename from F-Droid/res/layout/repo_item.xml rename to app/src/main/res/layout/repo_item.xml diff --git a/F-Droid/res/layout/repodetails.xml b/app/src/main/res/layout/repodetails.xml similarity index 100% rename from F-Droid/res/layout/repodetails.xml rename to app/src/main/res/layout/repodetails.xml diff --git a/F-Droid/res/layout/select_local_apps_list_item.xml b/app/src/main/res/layout/select_local_apps_list_item.xml similarity index 100% rename from F-Droid/res/layout/select_local_apps_list_item.xml rename to app/src/main/res/layout/select_local_apps_list_item.xml diff --git a/F-Droid/res/layout/swap_activity.xml b/app/src/main/res/layout/swap_activity.xml similarity index 100% rename from F-Droid/res/layout/swap_activity.xml rename to app/src/main/res/layout/swap_activity.xml diff --git a/F-Droid/res/layout/swap_app_list_item.xml b/app/src/main/res/layout/swap_app_list_item.xml similarity index 100% rename from F-Droid/res/layout/swap_app_list_item.xml rename to app/src/main/res/layout/swap_app_list_item.xml diff --git a/F-Droid/res/layout/swap_blank.xml b/app/src/main/res/layout/swap_blank.xml similarity index 100% rename from F-Droid/res/layout/swap_blank.xml rename to app/src/main/res/layout/swap_blank.xml diff --git a/F-Droid/res/layout/swap_confirm_receive.xml b/app/src/main/res/layout/swap_confirm_receive.xml similarity index 100% rename from F-Droid/res/layout/swap_confirm_receive.xml rename to app/src/main/res/layout/swap_confirm_receive.xml diff --git a/F-Droid/res/layout/swap_connecting.xml b/app/src/main/res/layout/swap_connecting.xml similarity index 100% rename from F-Droid/res/layout/swap_connecting.xml rename to app/src/main/res/layout/swap_connecting.xml diff --git a/F-Droid/res/layout/swap_initial_loading.xml b/app/src/main/res/layout/swap_initial_loading.xml similarity index 100% rename from F-Droid/res/layout/swap_initial_loading.xml rename to app/src/main/res/layout/swap_initial_loading.xml diff --git a/F-Droid/res/layout/swap_join_wifi.xml b/app/src/main/res/layout/swap_join_wifi.xml similarity index 100% rename from F-Droid/res/layout/swap_join_wifi.xml rename to app/src/main/res/layout/swap_join_wifi.xml diff --git a/F-Droid/res/layout/swap_nfc.xml b/app/src/main/res/layout/swap_nfc.xml similarity index 100% rename from F-Droid/res/layout/swap_nfc.xml rename to app/src/main/res/layout/swap_nfc.xml diff --git a/F-Droid/res/layout/swap_peer_list_item.xml b/app/src/main/res/layout/swap_peer_list_item.xml similarity index 100% rename from F-Droid/res/layout/swap_peer_list_item.xml rename to app/src/main/res/layout/swap_peer_list_item.xml diff --git a/F-Droid/res/layout/swap_select_apps.xml b/app/src/main/res/layout/swap_select_apps.xml similarity index 100% rename from F-Droid/res/layout/swap_select_apps.xml rename to app/src/main/res/layout/swap_select_apps.xml diff --git a/F-Droid/res/layout/swap_success.xml b/app/src/main/res/layout/swap_success.xml similarity index 100% rename from F-Droid/res/layout/swap_success.xml rename to app/src/main/res/layout/swap_success.xml diff --git a/F-Droid/res/layout/swap_wifi_qr.xml b/app/src/main/res/layout/swap_wifi_qr.xml similarity index 100% rename from F-Droid/res/layout/swap_wifi_qr.xml rename to app/src/main/res/layout/swap_wifi_qr.xml diff --git a/F-Droid/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from F-Droid/res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/F-Droid/res/menu/manage_repos.xml b/app/src/main/res/menu/manage_repos.xml similarity index 100% rename from F-Droid/res/menu/manage_repos.xml rename to app/src/main/res/menu/manage_repos.xml diff --git a/F-Droid/res/menu/repo_details_activity.xml b/app/src/main/res/menu/repo_details_activity.xml similarity index 100% rename from F-Droid/res/menu/repo_details_activity.xml rename to app/src/main/res/menu/repo_details_activity.xml diff --git a/F-Droid/res/menu/swap_next.xml b/app/src/main/res/menu/swap_next.xml similarity index 100% rename from F-Droid/res/menu/swap_next.xml rename to app/src/main/res/menu/swap_next.xml diff --git a/F-Droid/res/menu/swap_next_search.xml b/app/src/main/res/menu/swap_next_search.xml similarity index 100% rename from F-Droid/res/menu/swap_next_search.xml rename to app/src/main/res/menu/swap_next_search.xml diff --git a/F-Droid/res/menu/swap_search.xml b/app/src/main/res/menu/swap_search.xml similarity index 100% rename from F-Droid/res/menu/swap_search.xml rename to app/src/main/res/menu/swap_search.xml diff --git a/F-Droid/res/menu/swap_skip.xml b/app/src/main/res/menu/swap_skip.xml similarity index 100% rename from F-Droid/res/menu/swap_skip.xml rename to app/src/main/res/menu/swap_skip.xml diff --git a/F-Droid/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from F-Droid/res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/F-Droid/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml similarity index 100% rename from F-Droid/res/values-ast/strings.xml rename to app/src/main/res/values-ast/strings.xml diff --git a/F-Droid/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml similarity index 100% rename from F-Droid/res/values-bg/strings.xml rename to app/src/main/res/values-bg/strings.xml diff --git a/F-Droid/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from F-Droid/res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/F-Droid/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from F-Droid/res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/F-Droid/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from F-Droid/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/F-Droid/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from F-Droid/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/F-Droid/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from F-Droid/res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/F-Droid/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml similarity index 100% rename from F-Droid/res/values-eo/strings.xml rename to app/src/main/res/values-eo/strings.xml diff --git a/F-Droid/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from F-Droid/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/F-Droid/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml similarity index 100% rename from F-Droid/res/values-eu/strings.xml rename to app/src/main/res/values-eu/strings.xml diff --git a/F-Droid/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from F-Droid/res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/F-Droid/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from F-Droid/res/values-fi/strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/F-Droid/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from F-Droid/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/F-Droid/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml similarity index 100% rename from F-Droid/res/values-gl/strings.xml rename to app/src/main/res/values-gl/strings.xml diff --git a/F-Droid/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml similarity index 100% rename from F-Droid/res/values-he/strings.xml rename to app/src/main/res/values-he/strings.xml diff --git a/F-Droid/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml similarity index 100% rename from F-Droid/res/values-hi/strings.xml rename to app/src/main/res/values-hi/strings.xml diff --git a/F-Droid/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from F-Droid/res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/F-Droid/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml similarity index 100% rename from F-Droid/res/values-id/strings.xml rename to app/src/main/res/values-id/strings.xml diff --git a/F-Droid/res/values-in b/app/src/main/res/values-in similarity index 100% rename from F-Droid/res/values-in rename to app/src/main/res/values-in diff --git a/F-Droid/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from F-Droid/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/F-Droid/res/values-iw b/app/src/main/res/values-iw similarity index 100% rename from F-Droid/res/values-iw rename to app/src/main/res/values-iw diff --git a/F-Droid/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml similarity index 100% rename from F-Droid/res/values-ja/strings.xml rename to app/src/main/res/values-ja/strings.xml diff --git a/F-Droid/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 100% rename from F-Droid/res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml diff --git a/F-Droid/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml similarity index 100% rename from F-Droid/res/values-lt/strings.xml rename to app/src/main/res/values-lt/strings.xml diff --git a/F-Droid/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml similarity index 100% rename from F-Droid/res/values-lv/strings.xml rename to app/src/main/res/values-lv/strings.xml diff --git a/F-Droid/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml similarity index 100% rename from F-Droid/res/values-nb/strings.xml rename to app/src/main/res/values-nb/strings.xml diff --git a/F-Droid/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from F-Droid/res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/F-Droid/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 100% rename from F-Droid/res/values-pl/strings.xml rename to app/src/main/res/values-pl/strings.xml diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from F-Droid/res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/F-Droid/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from F-Droid/res/values-pt-rPT/strings.xml rename to app/src/main/res/values-pt-rPT/strings.xml diff --git a/F-Droid/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml similarity index 100% rename from F-Droid/res/values-ro/strings.xml rename to app/src/main/res/values-ro/strings.xml diff --git a/F-Droid/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from F-Droid/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/F-Droid/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml similarity index 100% rename from F-Droid/res/values-sc/strings.xml rename to app/src/main/res/values-sc/strings.xml diff --git a/F-Droid/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml similarity index 100% rename from F-Droid/res/values-sk/strings.xml rename to app/src/main/res/values-sk/strings.xml diff --git a/F-Droid/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml similarity index 100% rename from F-Droid/res/values-sl/strings.xml rename to app/src/main/res/values-sl/strings.xml diff --git a/F-Droid/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml similarity index 100% rename from F-Droid/res/values-sq/strings.xml rename to app/src/main/res/values-sq/strings.xml diff --git a/F-Droid/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml similarity index 100% rename from F-Droid/res/values-sr/strings.xml rename to app/src/main/res/values-sr/strings.xml diff --git a/F-Droid/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from F-Droid/res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/F-Droid/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from F-Droid/res/values-tr/strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/F-Droid/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml similarity index 100% rename from F-Droid/res/values-ug/strings.xml rename to app/src/main/res/values-ug/strings.xml diff --git a/F-Droid/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from F-Droid/res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/F-Droid/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml similarity index 100% rename from F-Droid/res/values-v11/styles.xml rename to app/src/main/res/values-v11/styles.xml diff --git a/F-Droid/res/values-v16/styles.xml b/app/src/main/res/values-v16/styles.xml similarity index 100% rename from F-Droid/res/values-v16/styles.xml rename to app/src/main/res/values-v16/styles.xml diff --git a/F-Droid/res/values-v17/styles.xml b/app/src/main/res/values-v17/styles.xml similarity index 100% rename from F-Droid/res/values-v17/styles.xml rename to app/src/main/res/values-v17/styles.xml diff --git a/F-Droid/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml similarity index 100% rename from F-Droid/res/values-v21/styles.xml rename to app/src/main/res/values-v21/styles.xml diff --git a/F-Droid/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from F-Droid/res/values-vi/strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from F-Droid/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from F-Droid/res/values-zh-rHK/strings.xml rename to app/src/main/res/values-zh-rHK/strings.xml diff --git a/F-Droid/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from F-Droid/res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/F-Droid/res/values/array.xml b/app/src/main/res/values/array.xml similarity index 100% rename from F-Droid/res/values/array.xml rename to app/src/main/res/values/array.xml diff --git a/F-Droid/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from F-Droid/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/F-Droid/res/values/default_repo.xml b/app/src/main/res/values/default_repo.xml similarity index 100% rename from F-Droid/res/values/default_repo.xml rename to app/src/main/res/values/default_repo.xml diff --git a/F-Droid/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from F-Droid/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/F-Droid/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml similarity index 100% rename from F-Droid/res/values/donottranslate.xml rename to app/src/main/res/values/donottranslate.xml diff --git a/F-Droid/res/values/ids.xml b/app/src/main/res/values/ids.xml similarity index 100% rename from F-Droid/res/values/ids.xml rename to app/src/main/res/values/ids.xml diff --git a/F-Droid/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from F-Droid/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/F-Droid/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from F-Droid/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/F-Droid/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from F-Droid/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/F-Droid/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml similarity index 100% rename from F-Droid/res/xml/searchable.xml rename to app/src/main/res/xml/searchable.xml diff --git a/F-Droid/tools/build-zip b/app/tools/build-zip similarity index 100% rename from F-Droid/tools/build-zip rename to app/tools/build-zip diff --git a/F-Droid/tools/check-string-format.py b/app/tools/check-string-format.py similarity index 91% rename from F-Droid/tools/check-string-format.py rename to app/tools/check-string-format.py index e24f8cc52..3415ab0c4 100755 --- a/F-Droid/tools/check-string-format.py +++ b/app/tools/check-string-format.py @@ -14,7 +14,7 @@ validFormatRe = re.compile(r'^(%%|%[sd]|%[0-9]\$[sd])$') count = 0 -for d in glob.glob(os.path.join('res', 'values-*')): +for d in glob.glob(os.path.join('src', 'main', 'res', 'values-*')): str_path = os.path.join(d, 'strings.xml') if not os.path.exists(str_path): diff --git a/F-Droid/tools/download-material-icon.sh b/app/tools/download-material-icon.sh similarity index 100% rename from F-Droid/tools/download-material-icon.sh rename to app/tools/download-material-icon.sh diff --git a/F-Droid/tools/langs-list-check.py b/app/tools/langs-list-check.py similarity index 84% rename from F-Droid/tools/langs-list-check.py rename to app/tools/langs-list-check.py index 83ea03445..4b1953a6f 100755 --- a/F-Droid/tools/langs-list-check.py +++ b/app/tools/langs-list-check.py @@ -11,7 +11,7 @@ from xml.etree import ElementTree prefs = set(['']) trans = set(['', 'en']) -donottranslate = os.path.join('res', 'values', 'donottranslate.xml') +donottranslate = os.path.join('src', 'main', 'res', 'values', 'donottranslate.xml') for e in ElementTree.parse(donottranslate).getroot().findall('.//string-array'): if e.attrib['name'] != 'languageValues': @@ -22,8 +22,8 @@ for e in ElementTree.parse(donottranslate).getroot().findall('.//string-array'): continue prefs.add(lang) -for d in glob.glob(os.path.join('res', 'values-*')): - lang = d[len(os.path.join('res', 'values-')):] +for d in glob.glob(os.path.join('src', 'main', 'res', 'values-*')): + lang = d[len(os.path.join('src', 'main', 'res', 'values-')):] if not lang: continue if re.match('^v[0-9]+$', lang): diff --git a/F-Droid/tools/remove-unused-trans.py b/app/tools/remove-unused-trans.py similarity index 88% rename from F-Droid/tools/remove-unused-trans.py rename to app/tools/remove-unused-trans.py index b231fbcac..89978cf88 100755 --- a/F-Droid/tools/remove-unused-trans.py +++ b/app/tools/remove-unused-trans.py @@ -9,7 +9,7 @@ from xml.etree import ElementTree strings = set() -for e in ElementTree.parse(os.path.join('res', 'values', 'strings.xml')).getroot().findall('.//string'): +for e in ElementTree.parse(os.path.join('src', 'main', 'res', 'values', 'strings.xml')).getroot().findall('.//string'): name = e.attrib['name'] strings.add(name) diff --git a/F-Droid/tools/svg-to-drawables.sh b/app/tools/svg-to-drawables.sh similarity index 100% rename from F-Droid/tools/svg-to-drawables.sh rename to app/tools/svg-to-drawables.sh diff --git a/F-Droid/tools/test-search-intents.sh b/app/tools/test-search-intents.sh similarity index 100% rename from F-Droid/tools/test-search-intents.sh rename to app/tools/test-search-intents.sh diff --git a/F-Droid/tools/zip-installer b/app/tools/zip-installer similarity index 100% rename from F-Droid/tools/zip-installer rename to app/tools/zip-installer diff --git a/F-Droid/tools/zip-uninstaller b/app/tools/zip-uninstaller similarity index 100% rename from F-Droid/tools/zip-uninstaller rename to app/tools/zip-uninstaller diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 664db6195..fb2da6279 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -31,7 +31,10 @@ - + + + @@ -78,7 +81,6 @@ - diff --git a/settings.gradle b/settings.gradle index f9784abd9..e16e5f8e2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':F-Droid' +include ':app' include ':Privileged-Extension' include ':privileged-api-lib' if (hasProperty('sourceDeps')) {