diff --git a/app/src/main/java/com/dimtion/shaarlier/helpers/RestAPINetworkManager.java b/app/src/main/java/com/dimtion/shaarlier/helpers/RestAPINetworkManager.java index 76b2fd8..4f500b7 100644 --- a/app/src/main/java/com/dimtion/shaarlier/helpers/RestAPINetworkManager.java +++ b/app/src/main/java/com/dimtion/shaarlier/helpers/RestAPINetworkManager.java @@ -131,7 +131,7 @@ public void pushLink(Link link) throws IOException { requestBody.put("url", link.getUrl()); requestBody.put("title", link.getTitle()); requestBody.put("description", link.getDescription()); - requestBody.put("tags", link.getTags().split(",")); + requestBody.put("tags", new JSONArray(link.getTagList())); requestBody.put("private", link.isPrivate()); if (link.isTweet()) { // TODO tweet Log.e("RequestAPI:post", "Tweet feature not implemented"); @@ -139,6 +139,7 @@ public void pushLink(Link link) throws IOException { if (link.isToot()) { // TODO toot Log.e("RequestAPI:post", "Toot feature not implemented"); } + Log.d("PushLink", requestBody.toString(2)); } catch (JSONException e) { Log.e("RequestAPI:post", e.toString()); } @@ -212,7 +213,7 @@ public List retrieveTags() throws Exception { String getJwt() { // iat in the payload Date date = new Date(); - // During debugging I found that given that some servers and phones are not absolutly in sync + // During debugging I found that given that some servers and phones are not absolutely in sync // It happens that the token would looked like being generated in the future // To compensate that we remove 5 from the actual date. date.setTime(date.getTime() - 5000); diff --git a/app/src/main/java/com/dimtion/shaarlier/utils/Link.java b/app/src/main/java/com/dimtion/shaarlier/utils/Link.java index e7a8166..e7eea3c 100644 --- a/app/src/main/java/com/dimtion/shaarlier/utils/Link.java +++ b/app/src/main/java/com/dimtion/shaarlier/utils/Link.java @@ -1,6 +1,8 @@ package com.dimtion.shaarlier.utils; import java.io.Serializable; +import java.util.Arrays; +import java.util.List; public class Link implements Serializable { private Integer id; @@ -75,10 +77,15 @@ public void setDescription(String description) { this.description = description; } + @Deprecated public String getTags() { return tags; } + public List getTagList() { + return Arrays.asList(tags.split(", ")); + } + public void setTags(String tags) { this.tags = tags; } diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c33fdde..e01610e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -68,12 +68,14 @@ Avancé Tweeter Toot - Twitter (nécessite shaarli2twitter) - Mastodon (nécessite shaarli2mastodon) + Twitter via shaarli2twitter (obsolète) + Mastodon via shaarli2mastodon (obsolète) Ouvrir Shaarli edition Rest API Secret Share error Channel dedicated to sharing errors Utiliser le mot de passe (obsolète) + Url : + Batman \ No newline at end of file diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index cf4e1f9..a7b2fc9 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -28,23 +28,6 @@ Základné prihlásenie cez HTTP Adresa vášho Shaarli: - com.dimtion.shaarliposter.parms - com.dimtion.shaarliposter.p_url_shaarli - com.dimtion.shaarliposter.p_username - com.dimtion.shaarliposter.p_password - com.dimtion.shaarliposter.p_basic_username - com.dimtion.shaarliposter.p_basic_password - com.dimtion.shaarliposter.p_validated - com.dimtion.shaarlier.p_default_private - com.dimtion.shaarlier.p_show_share_dialog - com.dimtion.shaarlier.p_protocol - com.dimtion.shaarlier.p_user_url - com.dimtion.shaarlier.auto_title - com.dimtion.shaarlier.auto_description - com.dimtion.shaarlier.p_version - com.dimtion.shaarlier.p_default_account - com.dimtion.shaarlier.saved_tags - Zdielať odkaz O aplikácii Na použitie tejto aplikácie potrebujete nainštalovaný Shaarli. @@ -61,8 +44,6 @@ Batman https://shaarli.myserver.org Otvoriť moje Shaarli - https://shaarli.dimtion.fr - zizou.xena@gmail.com Zdielať odkaz Neznáma verzia (nevypĺňajte, ak chcete pridať poznámku) @@ -83,7 +64,6 @@ Vymazať účet Nový účet Určite chcete vymazať tento účet? - com.dimtion.shaarlier.database_key Zakázať overenie certifikátu (nezabezpečené) Vyskytla sa chyba Pridať účet @@ -93,8 +73,6 @@ Automaticky načítať popis stránky Zobraziť Shaarlier v zozname webových prehliadačov "Verzia %1$s" - com.dimtion.shaarlier.shaarli2twitter - com.dimtion.shaarlier.shaarli2mastodon Tweetnuť Tootnuť Použiť twitter (vyžaduje rozšírenie shaarli2twitter) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3e75d10..4eddd06 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,7 +58,7 @@ Title could not be loaded Description could not be loaded Automatically load page title - Batman + Batman https://shaarli.myserver.org Open my Shaarli https://shaarli.dimtion.fr @@ -67,7 +67,7 @@ Version unknown (empty for a new note) Link to share: - Url: + Url: (leave empty for a new note) Title: Title @@ -97,8 +97,8 @@ com.dimtion.shaarlier.shaarli2mastodon Tweet Toot - Use twitter (needs shaarli2twitter plugin) - Use mastodon (needs shaarli2mastodon plugin) + Use twitter via shaarli2twitter (deprecated) + Use mastodon via shaarli2mastodon (deprecated) Advanced Open Shaarli editing