gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-15 16:55:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update gradle

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-30 21:39:24 +01:00
parent e3451342f3
commit 1c3792bc21
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
11 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java
View File

@ -56,7 +56,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback<Mention
int end = range[1]; int end = range[1];
String replacement = item.label; String replacement = item.label;
StringBuilder replacementStringBuilder = new StringBuilder(item.getLabel()); StringBuilder replacementStringBuilder = new StringBuilder(item.label);
for (EmojiRange emojiRange : EmojiUtils.emojis(replacement)) { for (EmojiRange emojiRange : EmojiUtils.emojis(replacement)) {
replacementStringBuilder.delete(emojiRange.start, emojiRange.end); replacementStringBuilder.delete(emojiRange.start, emojiRange.end);
} }
@ -64,10 +64,10 @@ public class MentionAutocompleteCallback implements AutocompleteCallback<Mention
editable.replace(start, end, replacementStringBuilder.toString() + " "); editable.replace(start, end, replacementStringBuilder.toString() + " ");
Spans.MentionChipSpan mentionChipSpan = Spans.MentionChipSpan mentionChipSpan =
new Spans.MentionChipSpan(DisplayUtils.INSTANCE.getDrawableForMentionChipSpan(context, new Spans.MentionChipSpan(DisplayUtils.INSTANCE.getDrawableForMentionChipSpan(context,
item.getId(), item.getLabel(), conversationUser, item.getSource(), item.id, item.label, conversationUser, item.source,
R.xml.chip_you, editText), R.xml.chip_you, editText),
BetterImageSpan.ALIGN_CENTER, BetterImageSpan.ALIGN_CENTER,
item.getId(), item.getLabel()); item.id, item.label);
editable.setSpan(mentionChipSpan, start, start + replacementStringBuilder.toString().length(), editable.setSpan(mentionChipSpan, start, start + replacementStringBuilder.toString().length(),
Spanned.SPAN_INCLUSIVE_INCLUSIVE); Spanned.SPAN_INCLUSIVE_INCLUSIVE);
return true; return true;

24
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.java
View File

@ -61,13 +61,13 @@ public class BrowserFile {
public static BrowserFile getModelFromResponse(Response response, String remotePath) { public static BrowserFile getModelFromResponse(Response response, String remotePath) {
BrowserFile browserFile = new BrowserFile(); BrowserFile browserFile = new BrowserFile();
browserFile.setPath(Uri.decode(remotePath)); browserFile.path = (Uri.decode(remotePath));
browserFile.setDisplayName(Uri.decode(new File(remotePath).getName())); browserFile.displayName = (Uri.decode(new File(remotePath).getName()));
final List<Property> properties = response.getProperties(); final List<Property> properties = response.getProperties();
for (Property property : properties) { for (Property property : properties) {
if (property instanceof OCId) { if (property instanceof OCId) {
browserFile.setRemoteId(((OCId) property).getOcId()); browserFile.remoteId = (((OCId) property).getOcId());
} }
if (property instanceof ResourceType) { if (property instanceof ResourceType) {
@ -77,36 +77,36 @@ public class BrowserFile {
} }
if (property instanceof GetLastModified) { if (property instanceof GetLastModified) {
browserFile.setModifiedTimestamp(((GetLastModified) property).getLastModified()); browserFile.modifiedTimestamp = (((GetLastModified) property).getLastModified());
} }
if (property instanceof GetContentType) { if (property instanceof GetContentType) {
browserFile.setMimeType(((GetContentType) property).getType()); browserFile.mimeType = (((GetContentType) property).getType());
} }
if (property instanceof OCSize) { if (property instanceof OCSize) {
browserFile.setSize(((OCSize) property).getOcSize()); browserFile.size = (((OCSize) property).getOcSize());
} }
if (property instanceof NCPreview) { if (property instanceof NCPreview) {
browserFile.setHasPreview(((NCPreview) property).isNcPreview()); browserFile.hasPreview = (((NCPreview) property).isNcPreview());
} }
if (property instanceof OCFavorite) { if (property instanceof OCFavorite) {
browserFile.setFavorite(((OCFavorite) property).isOcFavorite()); browserFile.favorite = (((OCFavorite) property).isOcFavorite());
} }
if (property instanceof DisplayName) { if (property instanceof DisplayName) {
browserFile.setDisplayName(((DisplayName) property).getDisplayName()); browserFile.displayName = (((DisplayName) property).getDisplayName());
} }
if (property instanceof NCEncrypted) { if (property instanceof NCEncrypted) {
browserFile.setEncrypted(((NCEncrypted) property).isNcEncrypted()); browserFile.encrypted = (((NCEncrypted) property).isNcEncrypted());
} }
} }
if (TextUtils.isEmpty(browserFile.getMimeType()) && !browserFile.isFile()) { if (TextUtils.isEmpty(browserFile.mimeType) && !browserFile.isFile) {
browserFile.setMimeType("inode/directory"); browserFile.mimeType = ("inode/directory");
} }
return browserFile; return browserFile;

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCEncrypted.java
View File

@ -41,10 +41,12 @@ public class NCEncrypted implements Property {
public static final Name NAME = public static final Name NAME =
new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED); new Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_IS_ENCRYPTED);
@Getter
@Setter
private boolean ncEncrypted; private boolean ncEncrypted;
public boolean isNcEncrypted() {
return ncEncrypted;
}
private NCEncrypted(boolean isEncrypted) { private NCEncrypted(boolean isEncrypted) {
ncEncrypted = isEncrypted; ncEncrypted = isEncrypted;
} }

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/NCPreview.java
View File

@ -41,10 +41,12 @@ public class NCPreview implements Property {
public static final Property.Name NAME = public static final Property.Name NAME =
new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW); new Property.Name(DavUtils.NC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_HAS_PREVIEW);
@Getter
@Setter
private boolean ncPreview; private boolean ncPreview;
public boolean isNcPreview() {
return ncPreview;
}
private NCPreview(boolean hasPreview) { private NCPreview(boolean hasPreview) {
ncPreview = hasPreview; ncPreview = hasPreview;
} }

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCFavorite.java
View File

@ -41,10 +41,12 @@ public class OCFavorite implements Property {
public static final Property.Name NAME = public static final Property.Name NAME =
new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE); new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_FAVORITE);
@Getter
@Setter
private boolean ocFavorite; private boolean ocFavorite;
public boolean isOcFavorite() {
return ocFavorite;
}
OCFavorite(boolean isFavorite) { OCFavorite(boolean isFavorite) {
ocFavorite = isFavorite; ocFavorite = isFavorite;
} }

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCId.java
View File

@ -41,10 +41,12 @@ public class OCId implements Property {
public static final Name NAME = public static final Name NAME =
new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID); new Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_REMOTE_ID);
@Getter
@Setter
private String ocId; private String ocId;
public String getOcId() {
return ocId;
}
private OCId(String id) { private OCId(String id) {
ocId = id; ocId = id;
} }

6
app/src/main/java/com/nextcloud/talk/components/filebrowser/models/properties/OCSize.java
View File

@ -41,10 +41,12 @@ public class OCSize implements Property {
public static final Property.Name NAME = public static final Property.Name NAME =
new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE); new Property.Name(DavUtils.OC_NAMESPACE, DavUtils.EXTENDED_PROPERTY_NAME_SIZE);
@Getter
@Setter
private long ocSize; private long ocSize;
public long getOcSize() {
return ocSize;
}
private OCSize(long size) { private OCSize(long size) {
ocSize = size; ocSize = size;
} }

4
app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java
View File

@ -42,7 +42,7 @@ public class HelloResponseWebSocketMessage {
public boolean serverHasMCUSupport() { public boolean serverHasMCUSupport() {
return serverHelloResponseFeaturesWebSocketMessage != null return serverHelloResponseFeaturesWebSocketMessage != null
&& serverHelloResponseFeaturesWebSocketMessage.getFeatures() != null && serverHelloResponseFeaturesWebSocketMessage.features != null
&& serverHelloResponseFeaturesWebSocketMessage.getFeatures().contains("mcu"); && serverHelloResponseFeaturesWebSocketMessage.features.contains("mcu");
} }
} }

17
app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java
View File

@ -150,7 +150,7 @@ public class ApiUtils {
@Nullable String invite, @Nullable String invite,
@Nullable String conversationName) { @Nullable String conversationName) {
RetrofitBucket retrofitBucket = new RetrofitBucket(); RetrofitBucket retrofitBucket = new RetrofitBucket();
retrofitBucket.setUrl(baseUrl + ocsApiVersion + spreedApiVersion + "/room"); retrofitBucket.url = (baseUrl + ocsApiVersion + spreedApiVersion + "/room");
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("roomType", roomType); queryMap.put("roomType", roomType);
@ -162,7 +162,7 @@ public class ApiUtils {
queryMap.put("roomName", conversationName); queryMap.put("roomName", conversationName);
} }
retrofitBucket.setQueryMap(queryMap); retrofitBucket.queryMap = (queryMap);
return retrofitBucket; return retrofitBucket;
} }
@ -170,14 +170,14 @@ public class ApiUtils {
public static RetrofitBucket getRetrofitBucketForAddParticipant(String baseUrl, String token, public static RetrofitBucket getRetrofitBucketForAddParticipant(String baseUrl, String token,
String user) { String user) {
RetrofitBucket retrofitBucket = new RetrofitBucket(); RetrofitBucket retrofitBucket = new RetrofitBucket();
retrofitBucket.setUrl( retrofitBucket.url = (
baseUrl + ocsApiVersion + spreedApiVersion + "/room/" + token + "/participants"); baseUrl + ocsApiVersion + spreedApiVersion + "/room/" + token + "/participants");
Map<String, String> queryMap = new HashMap<>(); Map<String, String> queryMap = new HashMap<>();
queryMap.put("newParticipant", user); queryMap.put("newParticipant", user);
retrofitBucket.setQueryMap(queryMap); retrofitBucket.queryMap = (queryMap);
return retrofitBucket; return retrofitBucket;
} }
@ -185,14 +185,7 @@ public class ApiUtils {
public static RetrofitBucket getRetrofitBucketForAddGroupParticipant(String baseUrl, String token, public static RetrofitBucket getRetrofitBucketForAddGroupParticipant(String baseUrl, String token,
String group) { String group) {
RetrofitBucket retrofitBucket = getRetrofitBucketForAddParticipant(baseUrl, token, group); RetrofitBucket retrofitBucket = getRetrofitBucketForAddParticipant(baseUrl, token, group);
retrofitBucket.getQueryMap().put("source", "groups"); retrofitBucket.queryMap.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");
return retrofitBucket; return retrofitBucket;
} }

2
build.gradle
View File

@ -36,7 +36,7 @@ buildscript {
} }
} }
dependencies { 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-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Dec 11 12:48:55 CET 2019 #Thu Jan 30 21:22:08 CET 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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