Browse Source

Move app source to subproject

Android Studio has started to fail for some stuff with that old structure (for example connected tests don't work).
It's about time to do this.

Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>
Álvaro Brey Vilas 3 years ago
parent
commit
e57176f009
100 changed files with 459 additions and 0 deletions
  1. 1 0
      app/.gitignore
  2. 458 0
      app/build.gradle
  3. 0 0
      app/detekt.yml
  4. 0 0
      app/lint.xml
  5. 0 0
      app/src/androidTest/AndroidManifest.xml
  6. 0 0
      app/src/androidTest/assets/calendar.ics
  7. 0 0
      app/src/androidTest/assets/christine.jpg
  8. 0 0
      app/src/androidTest/assets/decrypted.json
  9. 0 0
      app/src/androidTest/assets/encrypted.json
  10. 0 0
      app/src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r
  11. 0 0
      app/src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo
  12. 0 0
      app/src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r
  13. 0 0
      app/src/androidTest/assets/image.jpg
  14. 0 0
      app/src/androidTest/assets/imageFile.png
  15. 0 0
      app/src/androidTest/assets/java.md
  16. 0 0
      app/src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo
  17. 0 0
      app/src/androidTest/assets/paulette.jpg
  18. 0 0
      app/src/androidTest/assets/srEPevoPqPZpPEaeDnS3
  19. 0 0
      app/src/androidTest/assets/test.pdf
  20. 0 0
      app/src/androidTest/assets/vcard.vcf
  21. 0 0
      app/src/androidTest/assets/videoFile.mp4
  22. 0 0
      app/src/androidTest/disabledTests/AuthenticatorActivityTest.java
  23. 0 0
      app/src/androidTest/disabledTests/uiautomator/InitialTest.java
  24. 0 0
      app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt
  25. 0 0
      app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java
  26. 0 0
      app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java
  27. 0 0
      app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java
  28. 0 0
      app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java
  29. 0 0
      app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt
  30. 0 0
      app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java
  31. 0 0
      app/src/androidTest/java/com/nextcloud/client/GrantStoragePermissionRule.kt
  32. 0 0
      app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt
  33. 0 0
      app/src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java
  34. 0 0
      app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt
  35. 0 0
      app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java
  36. 0 0
      app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java
  37. 0 0
      app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt
  38. 0 0
      app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt
  39. 0 0
      app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java
  40. 0 0
      app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt
  41. 0 0
      app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java
  42. 0 0
      app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt
  43. 0 0
      app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt
  44. 0 0
      app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt
  45. 0 0
      app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt
  46. 0 0
      app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt
  47. 0 0
      app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt
  48. 0 0
      app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt
  49. 0 0
      app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt
  50. 0 0
      app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt
  51. 0 0
      app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt
  52. 0 0
      app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt
  53. 0 0
      app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt
  54. 0 0
      app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt
  55. 0 0
      app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt
  56. 0 0
      app/src/androidTest/java/com/nextcloud/sso/InputStreamBinderTest.kt
  57. 0 0
      app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt
  58. 0 0
      app/src/androidTest/java/com/owncloud/android/AbstractIT.java
  59. 0 0
      app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
  60. 0 0
      app/src/androidTest/java/com/owncloud/android/DownloadIT.java
  61. 0 0
      app/src/androidTest/java/com/owncloud/android/FileIT.java
  62. 0 0
      app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java
  63. 0 0
      app/src/androidTest/java/com/owncloud/android/UploadIT.java
  64. 0 0
      app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt
  65. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt
  66. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperTest.kt
  67. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java
  68. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.kt
  69. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java
  70. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt
  71. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java
  72. 0 0
      app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java
  73. 0 0
      app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
  74. 0 0
      app/src/androidTest/java/com/owncloud/android/operations/GetSharesForFileOperationIT.kt
  75. 0 0
      app/src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java
  76. 0 0
      app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt
  77. 0 0
      app/src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt
  78. 0 0
      app/src/androidTest/java/com/owncloud/android/providers/FileContentProviderVerificationIT.kt
  79. 0 0
      app/src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt
  80. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/LoginIT.java
  81. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java
  82. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt
  83. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java
  84. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java
  85. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java
  86. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java
  87. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt
  88. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt
  89. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt
  90. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java
  91. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt
  92. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java
  93. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt
  94. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt
  95. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt
  96. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java
  97. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt
  98. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt
  99. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/fragment/BackupListFragmentIT.kt
  100. 0 0
      app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt

+ 1 - 0
app/.gitignore

@@ -0,0 +1 @@
+/build

+ 458 - 0
app/build.gradle

@@ -0,0 +1,458 @@
+import com.github.spotbugs.snom.SpotBugsTask
+import org.gradle.internal.jvm.Jvm
+
+buildscript {
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.hiya:jacoco-android:0.2'
+        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.6'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0"
+        classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
+        classpath 'com.karumi:shot:5.13.0'
+        classpath "org.jacoco:org.jacoco.core:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.report:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
+    }
+}
+
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'checkstyle'
+apply plugin: 'pmd'
+apply plugin: 'com.hiya.jacoco-android'
+apply plugin: 'com.github.spotbugs'
+apply plugin: 'io.gitlab.arturbosch.detekt'
+apply plugin: 'shot'
+
+println "Gradle uses Java ${Jvm.current()}"
+
+configurations {
+    ktlint
+
+    all {
+        exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly
+
+        // check for updates every build
+        resolutionStrategy {
+            cacheChangingModulesFor 0, 'seconds'
+            exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug"
+        }
+    }
+}
+
+
+configurations.configureEach {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "org.checkerframework" && requested.name != "checker-compat-qual") {
+            useVersion(checkerVersion)
+            because("https://github.com/google/ExoPlayer/issues/10007")
+        }
+    }
+}
+
+repositories {
+    google()
+    maven { url "https://jitpack.io" }
+    mavenCentral()
+    maven {
+        url 'https://plugins.gradle.org/m2/'
+    }
+}
+
+// semantic versioning for version code
+def versionMajor = 3
+def versionMinor = 20
+def versionPatch = 0
+def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
+
+android {
+
+    compileSdkVersion 31
+
+    defaultConfig {
+        minSdkVersion 23
+        targetSdkVersion 30
+
+        buildConfigField 'boolean', 'CI', ciBuild.toString()
+
+        // arguments to be passed to functional tests
+        testInstrumentationRunner "com.nextcloud.client.ScreenshotTestRunner"
+        testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}"
+        testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}"
+        testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"
+        testInstrumentationRunnerArguments disableAnalytics: 'true'
+
+        multiDexEnabled true
+
+        versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
+
+        if (versionBuild > 89) {
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        } else if (versionBuild > 50) {
+            versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
+        } else {
+            versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
+        }
+
+        // adapt structure from Eclipse to Gradle/Android Studio expectations;
+        // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
+
+        flavorDimensions "default"
+
+        buildTypes {
+            debug {
+                testCoverageEnabled (project.hasProperty('coverage'))
+            }
+        }
+
+        productFlavors {
+            // used for f-droid
+            generic {
+                applicationId 'com.nextcloud.client'
+                dimension "default"
+            }
+
+            gplay {
+                applicationId 'com.nextcloud.client'
+                dimension "default"
+            }
+
+            huawei {
+                applicationId 'com.nextcloud.client'
+                dimension "default"
+            }
+
+            versionDev {
+                applicationId "com.nextcloud.android.beta"
+                dimension "default"
+                versionCode 20200129
+                versionName "20200129"
+            }
+
+            qa {
+                applicationId "com.nextcloud.android.qa"
+                dimension "default"
+                versionCode 1
+                versionName "1"
+            }
+        }
+
+        testOptions {
+            unitTests.returnDefaultValues = true
+            animationsDisabled true
+        }
+    }
+
+    // adapt structure from Eclipse to Gradle/Android Studio expectations;
+    // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
+    packagingOptions {
+        resources {
+            excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE']
+        }
+    }
+
+    tasks.register("checkstyle", Checkstyle) {
+        configFile = file("${rootProject.projectDir}/checkstyle.xml")
+        configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath
+        source 'src'
+        include '**/*.java'
+        exclude '**/gen/**'
+        classpath = files()
+    }
+
+    tasks.register("pmd", Pmd) {
+        ruleSetFiles = files("${project.rootDir}/ruleset.xml")
+        ignoreFailures = true // should continue checking
+        ruleSets = []
+
+        source 'src'
+        include '**/*.java'
+        exclude '**/gen/**'
+
+        reports {
+            xml.enabled = false
+            html.enabled = true
+            xml {
+                destination = file("$project.buildDir/reports/pmd/pmd.xml")
+            }
+            html {
+                destination = file("$project.buildDir/reports/pmd/pmd.html")
+            }
+        }
+    }
+
+    check.dependsOn 'checkstyle', 'spotbugsGplayDebugReport', 'pmd', 'lint', 'ktlint', 'detekt'
+
+    buildFeatures {
+        dataBinding true
+        viewBinding true
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
+    lint {
+        abortOnError false
+        checkGeneratedSources true
+        disable 'MissingTranslation', 'GradleDependency', 'VectorPath', 'IconMissingDensityFolder', 'IconDensities', 'GoogleAppIndexingWarning', 'MissingDefaultResource', 'InvalidPeriodicWorkRequestInterval', 'StringFormatInvalid', 'MissingQuantity'
+        htmlOutput file("$project.buildDir/reports/lint/lint.html")
+        htmlReport true
+    }
+
+}
+
+dependencies {
+    // dependencies for app building
+    implementation 'androidx.multidex:multidex:2.0.1'
+//    implementation project('nextcloud-android-library')
+    implementation ("com.github.nextcloud:android-library:$androidLibraryVersion") {
+        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version
+    }
+
+    compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' // remove after entire switch to lib v2
+    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
+    implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.5' // remove after entire switch to lib v2
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.jakewharton:disklrucache:2.0.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.webkit:webkit:1.4.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
+    implementation "androidx.work:work-runtime:$workRuntime"
+    implementation "androidx.work:work-runtime-ktx:$workRuntime"
+    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7
+    compileOnly 'com.google.code.findbugs:annotations:3.0.1u2'
+    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'org.greenrobot:eventbus:3.3.1'
+    implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
+    implementation 'org.lukhnos:nnio:0.2'
+    implementation 'org.bouncycastle:bcpkix-jdk15to18:1.70'
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.afollestad:sectioned-recyclerview:0.5.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
+    implementation 'com.github.tobiaskaminsky:qrcodescanner:0.1.2.4' // 'com.github.blikoon:QRCodeScanner:0.1.2'
+    implementation 'com.google.android:flexbox:2.0.1'
+    implementation('com.github.bumptech.glide:glide:3.8.0') {
+        exclude group: "com.android.support"
+    }
+    implementation 'com.caverock:androidsvg:1.4'
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'com.vanniktech:emoji-google:0.8.0'
+
+    implementation "com.github.cotechde.hwsecurity:hwsecurity-fido:$fidoVersion"
+    implementation "com.github.cotechde.hwsecurity:hwsecurity-fido2:$fidoVersion"
+
+    implementation 'com.github.zynkware:Document-Scanning-Android-SDK:1.0.1'
+
+    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
+    spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
+
+    implementation "com.google.dagger:dagger:$daggerVersion"
+    implementation "com.google.dagger:dagger-android:$daggerVersion"
+    implementation "com.google.dagger:dagger-android-support:$daggerVersion"
+    kapt "com.google.dagger:dagger-compiler:$daggerVersion"
+    kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
+
+    ktlint "com.pinterest:ktlint:0.44.0"
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+
+    implementation "com.google.android.exoplayer:exoplayer:$exoplayerVersion"
+    implementation "com.google.android.exoplayer:extension-okhttp:$exoplayerVersion"
+
+    // Shimmer animation
+    implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0'
+
+    // dependencies for markdown rendering
+    implementation "io.noties.markwon:core:$markwonVersion"
+    implementation "io.noties.markwon:ext-strikethrough:$markwonVersion"
+    implementation "io.noties.markwon:ext-tables:$markwonVersion"
+    implementation "io.noties.markwon:ext-tasklist:$markwonVersion"
+    implementation "io.noties.markwon:html:$markwonVersion"
+
+    implementation "io.noties.markwon:syntax-highlight:$markwonVersion"
+    implementation "io.noties:prism4j:$prismVersion"
+    kapt "io.noties:prism4j-bundler:$prismVersion"
+
+    implementation ('org.mnode.ical4j:ical4j:1.0.8') {
+        ['org.apache.commons','commons-logging'].each {
+            exclude group: "$it"
+        }
+    }
+
+    if (!ciBuild) {
+        debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+    }
+
+    // dependencies for local unit tests
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+    testImplementation "androidx.test:core:$androidxTestVersion"
+    testImplementation "org.powermock:powermock-core:$powermockVersion"
+    testImplementation "org.powermock:powermock-module-junit4:$powermockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
+    testImplementation 'org.json:json:20211205'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
+    testImplementation 'androidx.arch.core:core-testing:2.1.0'
+    testImplementation "io.mockk:mockk:$mockkVersion"
+    testImplementation "io.mockk:mockk-android:$mockkVersion"
+
+    // dependencies for instrumented tests
+    // JUnit4 Rules
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation "androidx.test:rules:$androidxTestVersion"
+    // Android JUnit Runner
+    androidTestImplementation "androidx.test:runner:$androidxTestVersion"
+    androidTestUtil "androidx.test:orchestrator:$androidxTestVersion"
+
+    // Espresso core
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-accessibility:$espressoVersion"
+
+    // Mocking support
+    androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older
+    androidTestImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
+    androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
+    androidTestImplementation("org.mockito:mockito-android:$mockitoVersion") {
+        exclude group: "net.bytebuddy", module: "byte-buddy-android"
+    }
+    androidTestImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion"
+    androidTestImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion"
+    androidTestImplementation "io.mockk:mockk-android:$mockkVersion"
+    androidTestImplementation 'androidx.arch.core:core-testing:2.0.1'
+    androidTestImplementation "com.facebook.testing.screenshot:core:0.15.0"
+
+    // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
+    // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
+    //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
+    androidTestImplementation 'tools.fastlane:screengrab:2.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    androidTestImplementation('androidx.test.espresso:espresso-intents:3.4.0')
+
+    implementation "com.github.stateless4j:stateless4j:2.6.0"
+
+    // upon each update first test: new registration, receive push
+    gplayImplementation "com.google.firebase:firebase-messaging:20.1.3"
+}
+
+configurations.all {
+    resolutionStrategy{
+        cacheChangingModulesFor 0, 'seconds'
+        force 'org.objenesis:objenesis:2.6'
+        eachDependency { details ->
+            if ('org.jacoco' == details.requested.group) {
+                details.useVersion "$jacoco_version"
+            }
+        }
+    }
+
+}
+
+tasks.withType(Test) {
+    // increased logging for tests
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}
+
+android.applicationVariants.all { variant ->
+    variant.outputs.all { output ->
+        outputFileName = "${output.baseName}-${variant.versionCode}.apk"
+    }
+}
+
+tasks.register("combinedTestReport", JacocoReport) {
+
+    jacocoClasspath = configurations['jacocoAnt']
+
+    reports {
+        xml.enabled true
+        html.enabled true
+        csv.enabled false
+    }
+
+    additionalSourceDirs.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
+    sourceDirectories.setFrom files(subprojects.sourceSets.main.allSource.srcDirs)
+    classDirectories.setFrom files(subprojects.sourceSets.main.output)
+    executionData.setFrom project.fileTree(dir: project.buildDir, includes: [
+        'jacoco/testGplayDebugUnitTest.exec', 'outputs/code-coverage/connected/flavors/GPLAY/*coverage.ec'
+    ])
+}
+
+task ktlint(type: JavaExec, group: "verification") {
+    description = "Check Kotlin code style."
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "--reporter=plain", "--reporter=plain,output=${buildDir}/ktlint.txt,src/**/*.kt"
+}
+
+task ktlintFormat(type: JavaExec, group: "formatting") {
+    description = "Fix Kotlin code style deviations."
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "-F", "src/**/*.kt"
+}
+
+task installGitHooks(type: Copy, group: "development") {
+    description = "Install git hooks"
+    from("${project.rootDir}/scripts/hooks") {
+        include '*'
+    }
+    into '.git/hooks'
+}
+
+detekt {
+    reports {
+        xml {
+            enabled = false
+        }
+    }
+    config = files("detekt.yml")
+    input = files("src/")
+}
+
+shot {
+    showOnlyFailingTestsInReports = ciBuild
+    // CI environment renders some shadows slightly different from local VMs
+    // Add a 0.5% tolerance to account for that
+    tolerance = ciBuild ? 0.5: 0
+}
+
+jacoco {
+    toolVersion = "$jacoco_version"
+}
+
+spotbugs {
+    ignoreFailures = true // should continue checking
+    effort = "max"
+    reportLevel = "medium"
+}
+
+tasks.withType(SpotBugsTask){task ->
+    String variantNameCap = task.name.replace("spotbugs", "")
+    String variantName = variantNameCap.substring(0, 1).toLowerCase() + variantNameCap.substring(1)
+
+    dependsOn "compile${variantNameCap}Sources"
+
+    excludeFilter = file("${project.rootDir}/spotbugs-filter.xml")
+    classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/")
+    reports {
+        xml.enabled = false
+        html {
+            enabled = true
+            destination = file("$project.buildDir/reports/spotbugs/spotbugs.html")
+        }
+    }
+}

+ 0 - 0
detekt.yml → app/detekt.yml


+ 0 - 0
lint.xml → app/lint.xml


+ 0 - 0
src/androidTest/AndroidManifest.xml → app/src/androidTest/AndroidManifest.xml


+ 0 - 0
src/androidTest/assets/calendar.ics → app/src/androidTest/assets/calendar.ics


+ 0 - 0
src/androidTest/assets/christine.jpg → app/src/androidTest/assets/christine.jpg


+ 0 - 0
src/androidTest/assets/decrypted.json → app/src/androidTest/assets/decrypted.json


+ 0 - 0
src/androidTest/assets/encrypted.json → app/src/androidTest/assets/encrypted.json


+ 0 - 0
src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r → app/src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r


+ 0 - 0
src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo → app/src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo


+ 0 - 0
src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r → app/src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r


+ 0 - 0
src/androidTest/assets/image.jpg → app/src/androidTest/assets/image.jpg


+ 0 - 0
src/androidTest/assets/imageFile.png → app/src/androidTest/assets/imageFile.png


+ 0 - 0
src/androidTest/assets/java.md → app/src/androidTest/assets/java.md


+ 0 - 0
src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo → app/src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo


+ 0 - 0
src/androidTest/assets/paulette.jpg → app/src/androidTest/assets/paulette.jpg


+ 0 - 0
src/androidTest/assets/srEPevoPqPZpPEaeDnS3 → app/src/androidTest/assets/srEPevoPqPZpPEaeDnS3


+ 0 - 0
src/androidTest/assets/test.pdf → app/src/androidTest/assets/test.pdf


+ 0 - 0
src/androidTest/assets/vcard.vcf → app/src/androidTest/assets/vcard.vcf


+ 0 - 0
src/androidTest/assets/videoFile.mp4 → app/src/androidTest/assets/videoFile.mp4


+ 0 - 0
src/androidTest/disabledTests/AuthenticatorActivityTest.java → app/src/androidTest/disabledTests/AuthenticatorActivityTest.java


+ 0 - 0
src/androidTest/disabledTests/uiautomator/InitialTest.java → app/src/androidTest/disabledTests/uiautomator/InitialTest.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt → app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java → app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java → app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java → app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java → app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt → app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java → app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/GrantStoragePermissionRule.kt → app/src/androidTest/java/com/nextcloud/client/GrantStoragePermissionRule.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/RetryTestRule.kt → app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java → app/src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt → app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java → app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java → app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt → app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt → app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java → app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt → app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java → app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java


+ 0 - 0
src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt → app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt → app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt → app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt → app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt → app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt → app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt → app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt → app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt → app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt → app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt → app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt → app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt → app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt → app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/sso/InputStreamBinderTest.kt → app/src/androidTest/java/com/nextcloud/sso/InputStreamBinderTest.kt


+ 0 - 0
src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt → app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/AbstractIT.java → app/src/androidTest/java/com/owncloud/android/AbstractIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java → app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/DownloadIT.java → app/src/androidTest/java/com/owncloud/android/DownloadIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/FileIT.java → app/src/androidTest/java/com/owncloud/android/FileIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ScreenshotsIT.java → app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/UploadIT.java → app/src/androidTest/java/com/owncloud/android/UploadIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt → app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt → app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperTest.kt → app/src/androidTest/java/com/owncloud/android/datamodel/ContentResolverHelperTest.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java → app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.kt → app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java → app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt → app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java → app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java → app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt → app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/operations/GetSharesForFileOperationIT.kt → app/src/androidTest/java/com/owncloud/android/operations/GetSharesForFileOperationIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java → app/src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt → app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt → app/src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/providers/FileContentProviderVerificationIT.kt → app/src/androidTest/java/com/owncloud/android/providers/FileContentProviderVerificationIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt → app/src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/LoginIT.java → app/src/androidTest/java/com/owncloud/android/ui/LoginIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java → app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt → app/src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java → app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java → app/src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java → app/src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java → app/src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt → app/src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt → app/src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt → app/src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java → app/src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt → app/src/androidTest/java/com/owncloud/android/ui/adapter/OCFileListAdapterIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java → app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt → app/src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt → app/src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt → app/src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java → app/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt → app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt → app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/fragment/BackupListFragmentIT.kt → app/src/androidTest/java/com/owncloud/android/ui/fragment/BackupListFragmentIT.kt


+ 0 - 0
src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt → app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt


Some files were not shown because too many files changed in this diff