From 1c3792bc215b9d6babc59044747279d7d7149164 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 30 Jan 2020 21:39:24 +0100 Subject: [PATCH] Update gradle Signed-off-by: Mario Danic --- .../MentionAutocompleteCallback.java | 6 ++--- .../filebrowser/models/BrowserFile.java | 24 +++++++++---------- .../models/properties/NCEncrypted.java | 6 +++-- .../models/properties/NCPreview.java | 6 +++-- .../models/properties/OCFavorite.java | 6 +++-- .../filebrowser/models/properties/OCId.java | 6 +++-- .../filebrowser/models/properties/OCSize.java | 6 +++-- .../HelloResponseWebSocketMessage.java | 4 ++-- .../com/nextcloud/talk/utils/ApiUtils.java | 17 ++++--------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 11 files changed, 45 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java index a259a2c5b..52744fba8 100644 --- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java +++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java @@ -56,7 +56,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback properties = response.getProperties(); for (Property property : properties) { if (property instanceof OCId) { - browserFile.setRemoteId(((OCId) property).getOcId()); + browserFile.remoteId = (((OCId) property).getOcId()); } if (property instanceof ResourceType) { @@ -77,36 +77,36 @@ public class BrowserFile { } if (property instanceof GetLastModified) { - browserFile.setModifiedTimestamp(((GetLastModified) property).getLastModified()); + browserFile.modifiedTimestamp = (((GetLastModified) property).getLastModified()); } if (property instanceof GetContentType) { - browserFile.setMimeType(((GetContentType) property).getType()); + browserFile.mimeType = (((GetContentType) property).getType()); } if (property instanceof OCSize) { - browserFile.setSize(((OCSize) property).getOcSize()); + browserFile.size = (((OCSize) property).getOcSize()); } if (property instanceof NCPreview) { - browserFile.setHasPreview(((NCPreview) property).isNcPreview()); + browserFile.hasPreview = (((NCPreview) property).isNcPreview()); } if (property instanceof OCFavorite) { - browserFile.setFavorite(((OCFavorite) property).isOcFavorite()); + browserFile.favorite = (((OCFavorite) property).isOcFavorite()); } if (property instanceof DisplayName) { - browserFile.setDisplayName(((DisplayName) property).getDisplayName()); + browserFile.displayName = (((DisplayName) property).getDisplayName()); } if (property instanceof NCEncrypted) { - browserFile.setEncrypted(((NCEncrypted) property).isNcEncrypted()); + browserFile.encrypted = (((NCEncrypted) property).isNcEncrypted()); } } - if (TextUtils.isEmpty(browserFile.getMimeType()) && !browserFile.isFile()) { - browserFile.setMimeType("inode/directory"); + if (TextUtils.isEmpty(browserFile.mimeType) && !browserFile.isFile) { + browserFile.mimeType = ("inode/directory"); } return browserFile; diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java index a4ee549c9..b0a71d29e 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java @@ -41,10 +41,12 @@ public class NCEncrypted implements Property { public static final Name NAME = new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED); - @Getter - @Setter private boolean ncEncrypted; + public boolean isNcEncrypted() { + return ncEncrypted; + } + private NCEncrypted(boolean isEncrypted) { ncEncrypted = isEncrypted; } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java index 67930a55a..3849376b8 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java @@ -41,10 +41,12 @@ public class NCPreview implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW); - @Getter - @Setter private boolean ncPreview; + public boolean isNcPreview() { + return ncPreview; + } + private NCPreview(boolean hasPreview) { ncPreview = hasPreview; } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java index d0155a445..6cad99070 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java @@ -41,10 +41,12 @@ public class OCFavorite implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE); - @Getter - @Setter private boolean ocFavorite; + public boolean isOcFavorite() { + return ocFavorite; + } + OCFavorite(boolean isFavorite) { ocFavorite = isFavorite; } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java index d3f97dd7e..1db044a17 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java @@ -41,10 +41,12 @@ public class OCId implements Property { public static final Name NAME = new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID); - @Getter - @Setter private String ocId; + public String getOcId() { + return ocId; + } + private OCId(String id) { ocId = id; } diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java index 9da4de0e4..6d4b8ff34 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java +++ b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java @@ -41,10 +41,12 @@ public class OCSize implements Property { public static final Property.Name NAME = new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE); - @Getter - @Setter private long ocSize; + public long getOcSize() { + return ocSize; + } + private OCSize(long size) { ocSize = size; } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java index c089a4757..644efef88 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java @@ -42,7 +42,7 @@ public class HelloResponseWebSocketMessage { public boolean serverHasMCUSupport() { return serverHelloResponseFeaturesWebSocketMessage != null - && serverHelloResponseFeaturesWebSocketMessage.getFeatures() != null - && serverHelloResponseFeaturesWebSocketMessage.getFeatures().contains("mcu"); + && serverHelloResponseFeaturesWebSocketMessage.features != null + && serverHelloResponseFeaturesWebSocketMessage.features.contains("mcu"); } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index 201a54a16..ffd94921d 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -150,7 +150,7 @@ public class ApiUtils { @Nullable String invite, @Nullable String conversationName) { RetrofitBucket retrofitBucket = new RetrofitBucket(); - retrofitBucket.setUrl(baseUrl + ocsApiVersion + spreedApiVersion + "/room"); + retrofitBucket.url = (baseUrl + ocsApiVersion + spreedApiVersion + "/room"); Map queryMap = new HashMap<>(); queryMap.put("roomType", roomType); @@ -162,7 +162,7 @@ public class ApiUtils { queryMap.put("roomName", conversationName); } - retrofitBucket.setQueryMap(queryMap); + retrofitBucket.queryMap = (queryMap); return retrofitBucket; } @@ -170,14 +170,14 @@ public class ApiUtils { public static RetrofitBucket getRetrofitBucketForAddParticipant(String baseUrl, String token, String user) { RetrofitBucket retrofitBucket = new RetrofitBucket(); - retrofitBucket.setUrl( + retrofitBucket.url = ( baseUrl + ocsApiVersion + spreedApiVersion + "/room/" + token + "/participants"); Map queryMap = new HashMap<>(); queryMap.put("newParticipant", user); - retrofitBucket.setQueryMap(queryMap); + retrofitBucket.queryMap = (queryMap); return retrofitBucket; } @@ -185,14 +185,7 @@ public class ApiUtils { public static RetrofitBucket getRetrofitBucketForAddGroupParticipant(String baseUrl, String token, String group) { RetrofitBucket retrofitBucket = getRetrofitBucketForAddParticipant(baseUrl, token, group); - retrofitBucket.getQueryMap().put("source", "groups"); - return retrofitBucket; - } - - public static RetrofitBucket getRetrofitBucketForAddMailParticipant(String baseUrl, String token, - String mail) { - RetrofitBucket retrofitBucket = getRetrofitBucketForAddParticipant(baseUrl, token, mail); - retrofitBucket.getQueryMap().put("source", "emails"); + retrofitBucket.queryMap.put("source", "groups"); return retrofitBucket; } diff --git a/build.gradle b/build.gradle index b082e6e88..7913d8ac7 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.0.0-alpha09' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6f75d71c..918ae19f6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Dec 11 12:48:55 CET 2019 +#Thu Jan 30 21:22:08 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip