diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-05-11 15:45:22 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-05-12 11:58:43 +0300 |
commit | ccc812dc6edb0b42976ab0199f87e804ef5b2f74 (patch) | |
tree | 636c29b9024764919b8a29d3ac5f9d4e32f5774a /app/src/main/java/it/niedermann/owncloud/notes/shared | |
parent | 1bc0d8c9c1a4acc653360e8479bd01e972b281d0 (diff) |
#1079 Show DisplayName instead of uid attribute for LDAP users
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/shared')
3 files changed, 48 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java index 7688b1b1..5d3d2963 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/account/AccountChooserViewHolder.java @@ -31,7 +31,7 @@ public class AccountChooserViewHolder extends RecyclerView.ViewHolder { .into(binding.accountItemAvatar); binding.accountLayout.setOnClickListener((v) -> targetAccountConsumer.accept(localAccount)); - binding.accountName.setText(localAccount.getUserName()); + binding.accountName.setText(localAccount.getDisplayName()); binding.accountHost.setText(Uri.parse(localAccount.getUrl()).getHost()); } }
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OcsResponse.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OcsResponse.java new file mode 100644 index 00000000..c47b4151 --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/OcsResponse.java @@ -0,0 +1,32 @@ +package it.niedermann.owncloud.notes.shared.model; + +import com.google.gson.annotations.Expose; + +import java.io.Serializable; + +/** + * <a href="https://www.open-collaboration-services.org/">OpenCollaborationServices</a> + * + * @param <T> defines the payload of this {@link OcsResponse}. + */ +public class OcsResponse<T> implements Serializable { + + @Expose + public OcsWrapper<T> ocs; + + public static class OcsWrapper<T> { + @Expose + public OcsMeta meta; + @Expose + public T data; + } + + public static class OcsMeta { + @Expose + public String status; + @Expose + public int statuscode; + @Expose + public String message; + } +}
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/User.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/User.java new file mode 100644 index 00000000..0033b610 --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/User.java @@ -0,0 +1,15 @@ +package it.niedermann.owncloud.notes.shared.model; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +import java.io.Serializable; + +public class User implements Serializable { + @Expose + @SerializedName("id") + public String userId; + @Expose + @SerializedName("displayname") + public String displayName; +}
\ No newline at end of file |