Merge pull request nextcloud#5531 from nextcloud/fix/AS36

Update to Android Studio 3.6

Author: tobiasKaminsky

.idea/codeStyles/Project.xml

@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') {
             exclude group: 'org.codehaus.groovy', module: 'groovy-all'
         }
@@ -333,9 +333,6 @@ dependencies {
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
     kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
 
-    compileOnly "org.projectlombok:lombok:1.18.12"
-    annotationProcessor "org.projectlombok:lombok:1.18.12"
-
     ktlint "com.pinterest:ktlint:0.36.0"
     implementation 'org.conscrypt:conscrypt-android:2.2.1'
 

build.gradle

@@ -1 +1 @@
-382
+381

scripts/analysis/findbugs-results.txt

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

scripts/analysis/lint-results.txt

@@ -27,14 +27,10 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
-import lombok.Getter;
-
 public class PlainHeader implements Serializable {
     private static final long serialVersionUID = 3284979177401282512L;
 
-    @Getter
     private String name;
-    @Getter
     private String value;
 
     PlainHeader(String name, String value) {
@@ -51,4 +47,12 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
         name = (String) in.readObject();
         value = (String) in.readObject();
     }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
 }

src/main/java/com/nextcloud/android/sso/PlainHeader.java

@@ -30,10 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Getter;
-
 public class Response {
-    @Getter
     private InputStream body;
     private Header[] headers;
 
@@ -62,4 +59,8 @@ public String getPlainHeadersString() {
         Gson gson = new Gson();
         return gson.toJson(arrayList);
     }
+
+    public InputStream getBody() {
+        return this.body;
+    }
 }

src/main/java/com/nextcloud/android/sso/Response.java

@@ -19,25 +19,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-
-package com.owncloud.android.datamodel;
-
-import lombok.Getter;
+package com.owncloud.android.datamodel
 
 /**
- * Data set for {@link ArbitraryDataProvider}
+ * Data set for [ArbitraryDataProvider]
  */
-@Getter
-class ArbitraryDataSet {
-    private int id;
-    private String cloudId;
-    private String key;
-    private String value;
-
-    ArbitraryDataSet(int id, String cloudId, String key, String value) {
-        this.id = id;
-        this.cloudId = cloudId;
-        this.key = key;
-        this.value = value;
-    }
-}
+internal class ArbitraryDataSet(val id: Int, val cloudId: String, val key: String, val value: String)

src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.java src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt

@@ -24,16 +24,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * Decrypted class representation of metadata json of folder metadata.
  */
-@Getter
-@Setter
-@AllArgsConstructor
 public class DecryptedFolderMetadata {
     private Metadata metadata;
     private Map<String, DecryptedFile> files;
@@ -43,8 +36,27 @@ public DecryptedFolderMetadata() {
         this.files = new HashMap<>();
     }
 
-    @Getter
-    @Setter
+    public DecryptedFolderMetadata(Metadata metadata, Map<String, DecryptedFile> files) {
+        this.metadata = metadata;
+        this.files = files;
+    }
+
+    public Metadata getMetadata() {
+        return this.metadata;
+    }
+
+    public Map<String, DecryptedFile> getFiles() {
+        return this.files;
+    }
+
+    public void setMetadata(Metadata metadata) {
+        this.metadata = metadata;
+    }
+
+    public void setFiles(Map<String, DecryptedFile> files) {
+        this.files = files;
+    }
+
     public static class Metadata {
         private Map<Integer, String> metadataKeys; // each keys is encrypted on its own, decrypt on use
         private Sharing sharing;
@@ -54,36 +66,140 @@ public static class Metadata {
         public String toString() {
             return String.valueOf(version);
         }
+
+        public Map<Integer, String> getMetadataKeys() {
+            return this.metadataKeys;
+        }
+
+        public Sharing getSharing() {
+            return this.sharing;
+        }
+
+        public int getVersion() {
+            return this.version;
+        }
+
+        public void setMetadataKeys(Map<Integer, String> metadataKeys) {
+            this.metadataKeys = metadataKeys;
+        }
+
+        public void setSharing(Sharing sharing) {
+            this.sharing = sharing;
+        }
+
+        public void setVersion(int version) {
+            this.version = version;
+        }
     }
 
-    @Getter
-    @Setter
     public static class Encrypted {
         private Map<Integer, String> metadataKeys;
+
+        public Map<Integer, String> getMetadataKeys() {
+            return this.metadataKeys;
+        }
+
+        public void setMetadataKeys(Map<Integer, String> metadataKeys) {
+            this.metadataKeys = metadataKeys;
+        }
     }
 
-    @Getter
-    @Setter
     public static class Sharing {
         private Map<String, String> recipient;
         private String signature;
+
+        public Map<String, String> getRecipient() {
+            return this.recipient;
+        }
+
+        public String getSignature() {
+            return this.signature;
+        }
+
+        public void setRecipient(Map<String, String> recipient) {
+            this.recipient = recipient;
+        }
+
+        public void setSignature(String signature) {
+            this.signature = signature;
+        }
     }
 
-    @Getter
-    @Setter
     public static class DecryptedFile {
         private Data encrypted;
         private String initializationVector;
         private String authenticationTag;
         private int metadataKey;
+
+        public Data getEncrypted() {
+            return this.encrypted;
+        }
+
+        public String getInitializationVector() {
+            return this.initializationVector;
+        }
+
+        public String getAuthenticationTag() {
+            return this.authenticationTag;
+        }
+
+        public int getMetadataKey() {
+            return this.metadataKey;
+        }
+
+        public void setEncrypted(Data encrypted) {
+            this.encrypted = encrypted;
+        }
+
+        public void setInitializationVector(String initializationVector) {
+            this.initializationVector = initializationVector;
+        }
+
+        public void setAuthenticationTag(String authenticationTag) {
+            this.authenticationTag = authenticationTag;
+        }
+
+        public void setMetadataKey(int metadataKey) {
+            this.metadataKey = metadataKey;
+        }
     }
 
-    @Getter
-    @Setter
     public static class Data {
         private String key;
         private String filename;
         private String mimetype;
         private int version;
+
+        public String getKey() {
+            return this.key;
+        }
+
+        public String getFilename() {
+            return this.filename;
+        }
+
+        public String getMimetype() {
+            return this.mimetype;
+        }
+
+        public int getVersion() {
+            return this.version;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        public void setFilename(String filename) {
+            this.filename = filename;
+        }
+
+        public void setMimetype(String mimetype) {
+            this.mimetype = mimetype;
+        }
+
+        public void setVersion(int version) {
+            this.version = version;
+        }
     }
 }