Merge pull request #9009 from nextcloud/AS_GradleAGP702

AS Arctic Fox | 2020.3.1 Update to Gradle/AGP 7.0.2

.drone.yml

@@ -5,7 +5,7 @@ name: tests-stable
 
 steps:
   - name: gplay
-    image: nextcloudci/android8:android-61
+    image: ghcr.io/nextcloud/continuous-integration-android8:2
     privileged: true
     environment:
       LOG_USERNAME:
@@ -92,7 +92,7 @@ name: tests-master
 
 steps:
   - name: gplay
-    image: nextcloudci/android8:android-61
+    image: ghcr.io/nextcloud/continuous-integration-android8:2
     privileged: true
     environment:
       LOG_USERNAME:
@@ -170,7 +170,7 @@ name: analysis
 
 steps:
   - name: analysis
-    image: nextcloudci/android8:android-61
+    image: ghcr.io/nextcloud/continuous-integration-android8:2
     environment:
       GIT_USERNAME:
         from_secret: GIT_USERNAME

.github/workflows/check.yml

@@ -13,9 +13,10 @@ jobs:
                 task: [ detekt, ktlint ]
         steps:
             -   uses: actions/checkout@v2
-            -   name: Set up JDK 1.8
-                uses: actions/setup-java@v1
+            -   name: Set up JDK 11
+                uses: actions/setup-java@v2
                 with:
-                    java-version: 1.8
+                    distribution: "adopt"
+                    java-version: 11
             -   name: Check ${{ matrix.task }}
                 run: ./gradlew ${{ matrix.task }}

.github/workflows/qa.yml

@@ -13,11 +13,12 @@ jobs:
                 id: check-secrets
             -   uses: actions/checkout@v2
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
-            -   name: set up JDK 1.8
+            -   name: set up JDK 11
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
-                uses: actions/setup-java@v1
+                uses: actions/setup-java@v2
                 with:
-                    java-version: 1.8
+                    distribution: "adopt"
+                    java-version: 11
             -   name: Build QA
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
                 env:

.github/workflows/screenShotTest.yml

@@ -14,10 +14,11 @@ jobs:
                 color: [ blue ]
         steps:
             -   uses: actions/checkout@v2
-            -   name: set up JDK 1.8
-                uses: actions/setup-java@v1
+            -   name: set up JDK 11
+                uses: actions/setup-java@v2
                 with:
-                    java-version: 1.8
+                    distribution: "adopt"
+                    java-version: 11
             -   name: Build gplay
                 run: |
                     mkdir -p $HOME/.gradle

build.gradle

@@ -10,6 +10,7 @@ import org.gradle.internal.jvm.Jvm
 
 buildscript {
     ext.kotlin_version = '1.5.31'
+    ext.jacoco_version = '0.8.7'
     repositories {
         google()
         maven {
@@ -18,13 +19,16 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath 'com.hiya:jacoco-android:0.2'
         classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1"
         classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
         classpath 'com.karumi:shot:5.11.2'
+        classpath "org.jacoco:org.jacoco.core:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.report:$jacoco_version"
+        classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
     }
 }
 
@@ -70,9 +74,6 @@ ext {
     fidoVersion = "4.1.0"
 
     ciBuild = System.getenv("CI") == "true"
-
-    // allows for -D pre-dex=false to be set
-    preDexEnabled = "true" == System.getProperty("pre-dex", "true")
 }
 
 repositories {
@@ -100,8 +101,6 @@ for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()
     }
 }
 
-
-
 android {
     lintOptions {
         checkGeneratedSources = true
@@ -118,10 +117,6 @@ android {
             'InvalidPeriodicWorkRequestInterval' // crashes due to a bug in lint itself
     }
 
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
     compileSdkVersion 29
 
     defaultConfig {
@@ -194,11 +189,6 @@ android {
     // 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
 
-    dexOptions {
-        // Skip pre-dexing when running on CI or when disabled via -D pre-dex=false.
-        preDexLibraries = preDexEnabled && !ciBuild
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/LICENSE'
@@ -393,6 +383,11 @@ configurations.all {
     resolutionStrategy{
         cacheChangingModulesFor 0, 'seconds'
         force 'org.objenesis:objenesis:2.6'
+        eachDependency { details ->
+            if ('org.jacoco' == details.requested.group) {
+                details.useVersion "$jacoco_version"
+            }
+        }
     }
 
 }
@@ -412,6 +407,8 @@ android.applicationVariants.all { variant ->
 
 tasks.register("combinedTestReport", JacocoReport) {
 
+    jacocoClasspath = configurations['jacocoAnt']
+
     reports {
         xml.enabled true
         html.enabled true
@@ -463,5 +460,5 @@ shot {
 }
 
 jacoco {
-    toolVersion = "0.8.7"
+    toolVersion = "$jacoco_version"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-460
+458

scripts/analysis/lint-results.txt

@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 68 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 error and 118 warnings</span>

src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java

@@ -115,6 +115,10 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
         hostOwnServerTextView.setTextColor(getResources().getColor(R.color.login_text_color));
         hostOwnServerTextView.setVisibility(isProviderOrOwnInstallationVisible ? View.VISIBLE : View.GONE);
 
+        if(!isProviderOrOwnInstallationVisible) {
+            hostOwnServerTextView.setOnClickListener(v -> onHostYourOwnServerClick());
+        }
+
         progressIndicator = findViewById(R.id.progressIndicator);
         ViewPager viewPager = findViewById(R.id.contentPanel);
 
@@ -200,7 +204,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
         // unused but to be implemented due to abstract parent
     }
 
-    public void onHostYourOwnServerClick(View view) {
+    public void onHostYourOwnServerClick() {
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_server_install)));
         DisplayUtils.startIntentIfAppAvailable(intent, this, R.string.no_browser_available);
     }

src/main/java/com/owncloud/android/providers/FileContentProvider.java

@@ -276,12 +276,10 @@ public class FileContentProvider extends ContentProvider {
                 String[] whereArgs = {remotePath, accountName};
 
                 Cursor doubleCheck = query(db, uri, projection, where, whereArgs, null);
-                // ugly patch; serious refactorization is needed to reduce work in
+                // ugly patch; serious refactoring is needed to reduce work in
                 // FileDataStorageManager and bring it to FileContentProvider
-                if (doubleCheck == null || !doubleCheck.moveToFirst()) {
-                    if (doubleCheck != null) {
-                        doubleCheck.close();
-                    }
+                if (!doubleCheck.moveToFirst()) {
+                    doubleCheck.close();
                     long rowId = db.insert(ProviderTableMeta.FILE_TABLE_NAME, null, values);
                     if (rowId > 0) {
                         return ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);

src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java

@@ -47,11 +47,9 @@ public class FileSortOrderBySize extends FileSortOrder {
 
         Collections.sort(files, (o1, o2) -> {
             if (o1.isFolder() && o2.isFolder()) {
-                Long obj1 = o1.getFileLength();
-                return multiplier * obj1.compareTo(o2.getFileLength());
+                return multiplier * Long.compare(o1.getFileLength(), o2.getFileLength());
             } else if (o1.isFolder()) {
                 return -1;
-
             } else if (o2.isFolder()) {
                 return 1;
             } else {
@@ -73,8 +71,7 @@ public class FileSortOrderBySize extends FileSortOrder {
 
         Collections.sort(files, (o1, o2) -> {
             if (o1.isFolder() && o2.isFolder()) {
-                Long obj1 = o1.getFileLength();
-                return multiplier * obj1.compareTo(o2.getFileLength());
+                return multiplier * Long.compare(o1.getFileLength(), o2.getFileLength());
             } else if (o1.isFolder()) {
                 return -1;
 
@@ -99,8 +96,8 @@ public class FileSortOrderBySize extends FileSortOrder {
 
         Collections.sort(files, (o1, o2) -> {
             if (o1.isDirectory() && o2.isDirectory()) {
-                Long obj1 = FileStorageUtils.getFolderSize(o1);
-                return multiplier * obj1.compareTo(FileStorageUtils.getFolderSize(o2));
+                return multiplier * Long.compare(FileStorageUtils.getFolderSize(o1),
+                                                 FileStorageUtils.getFolderSize(o2));
             } else if (o1.isDirectory()) {
                 return -1;
             } else if (o2.isDirectory()) {
@@ -112,5 +109,4 @@ public class FileSortOrderBySize extends FileSortOrder {
 
         return files;
     }
-
 }

src/main/res/layout/first_run_activity.xml

@@ -101,7 +101,6 @@
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
             android:gravity="center_horizontal"
-            android:onClick="onHostYourOwnServerClick"
             android:text="@string/host_your_own_server"/>
     </LinearLayout>