Skip to content

Commit

Permalink
Fix tag push bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@dimtion
dimtion committed Apr 1, 2020
1 parent 7355b76 commit c2f4f55
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 30 deletions.
5 changes: 3 additions & 2 deletions app/src/main/java/com/dimtion/shaarlier/helpers/RestAPINetworkManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,15 @@ 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");
}
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());
}
Expand Down Expand Up @@ -212,7 +213,7 @@ public List<String> 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);
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/dimtion/shaarlier/utils/Link.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -75,10 +77,15 @@ public void setDescription(String description) {
this.description = description;
}

@Deprecated
public String getTags() {
return tags;
}

public List<String> getTagList() {
return Arrays.asList(tags.split(", "));
}

public void setTags(String tags) {
this.tags = tags;
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/res/values-fr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@
<string name="advanced">Avancé</string>
<string name="tweet">Tweeter</string>
<string name="toot">Toot</string>
<string name="use_twitter">Twitter (nécessite shaarli2twitter)</string>
<string name="use_mastodon">Mastodon (nécessite shaarli2mastodon)</string>
<string name="use_twitter">Twitter via shaarli2twitter (obsolète)</string>
<string name="use_mastodon">Mastodon via shaarli2mastodon (obsolète)</string>
<string name="action_open_shaarli">Ouvrir Shaarli</string>
<string name="is_not_new_link">edition</string>
<string name="user_restAPIKey">Rest API Secret</string>
<string name="notification_channel_error_name">Share error</string>
<string name="notification_channel_error_description">Channel dedicated to sharing errors</string>
<string name="use_username_password_deprecated">Utiliser le mot de passe (obsolète)</string>
<string name="text_url" translatable="false">Url :</string>
<string name="username_hint">Batman</string>
</resources>
22 changes: 0 additions & 22 deletions app/src/main/res/values-sk/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,6 @@
<string name="basic_auth">Základné prihlásenie cez HTTP</string>
<string name="your_shaarli_url">Adresa vášho Shaarli:</string>

<string name="params" translatable="false">com.dimtion.shaarliposter.parms</string>
<string name="p_url_shaarli" translatable="false">com.dimtion.shaarliposter.p_url_shaarli</string>
<string name="p_username" translatable="false">com.dimtion.shaarliposter.p_username</string>
<string name="p_password" translatable="false">com.dimtion.shaarliposter.p_password</string>
<string name="p_basic_username" translatable="false">com.dimtion.shaarliposter.p_basic_username</string>
<string name="p_basic_password" translatable="false">com.dimtion.shaarliposter.p_basic_password</string>
<string name="p_validated" translatable="false">com.dimtion.shaarliposter.p_validated</string>
<string name="p_default_private" translatable="false">com.dimtion.shaarlier.p_default_private</string>
<string name="p_show_share_dialog" translatable="false">com.dimtion.shaarlier.p_show_share_dialog</string>
<string name="p_protocol" translatable="false">com.dimtion.shaarlier.p_protocol</string>
<string name="p_user_url" translatable="false">com.dimtion.shaarlier.p_user_url</string>
<string name="p_auto_title" translatable="false">com.dimtion.shaarlier.auto_title</string>
<string name="p_auto_description" translatable="false">com.dimtion.shaarlier.auto_description</string>
<string name="p_version" translatable="false">com.dimtion.shaarlier.p_version</string>
<string name="p_default_account" translatable="false">com.dimtion.shaarlier.p_default_account</string>
<string name="saved_tags" translatable="false">com.dimtion.shaarlier.saved_tags</string>

<string name="share">Zdielať odkaz</string>
<string name="text_about">O aplikácii</string>
<string name="text_about_details">Na použitie tejto aplikácie potrebujete nainštalovaný <a href="https://github.com/shaarli/Shaarli">Shaarli</a>.
Expand All @@ -61,8 +44,6 @@
<string name="username_hint" translatable="false">Batman</string>
<string name="url_hint">https://shaarli.myserver.org</string>
<string name="action_go_to_shaarli">Otvoriť moje Shaarli</string>
<string name="developer_shaarli" translatable="false">https://shaarli.dimtion.fr</string>
<string name="developer_mail" translatable="false">[email protected]</string>
<string name="action_share">Zdielať odkaz</string>
<string name="text_version">Neznáma verzia</string>
<string name="hint_new_url">(nevypĺňajte, ak chcete pridať poznámku)</string>
Expand All @@ -83,7 +64,6 @@
<string name="button_delete_account">Vymazať účet</string>
<string name="title_activity_add_account">Nový účet</string>
<string name="text_confirm_deletion_account">Určite chcete vymazať tento účet?</string>
<string name="dbKey" translatable="false">com.dimtion.shaarlier.database_key</string>
<string name="check_disable_cert_validation">Zakázať overenie certifikátu (nezabezpečené)</string>
<string name="error_unknown">Vyskytla sa chyba</string>
<string name="add_account">Pridať účet</string>
Expand All @@ -93,8 +73,6 @@
<string name="auto_load_description">Automaticky načítať popis stránky</string>
<string name="handle_http_scheme">Zobraziť Shaarlier v zozname webových prehliadačov</string>
<string name="version">"Verzia %1$s"</string>
<string name="p_shaarli2twitter" translatable="false">com.dimtion.shaarlier.shaarli2twitter</string>
<string name="p_shaarli2mastodon" translatable="false">com.dimtion.shaarlier.shaarli2mastodon</string>
<string name="tweet">Tweetnuť</string>
<string name="toot">Tootnuť</string>
<string name="use_twitter">Použiť twitter (vyžaduje rozšírenie shaarli2twitter)</string>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<string name="error_retrieving_title">Title could not be loaded</string>
<string name="error_retrieving_description">Description could not be loaded</string>
<string name="auto_load_title">Automatically load page title</string>
<string name="username_hint" translatable="false">Batman</string>
<string name="username_hint">Batman</string>
<string name="url_hint">https://shaarli.myserver.org</string>
<string name="action_go_to_shaarli">Open my Shaarli</string>
<string name="developer_shaarli" translatable="false">https://shaarli.dimtion.fr</string>
Expand All @@ -67,7 +67,7 @@
<string name="text_version">Version unknown</string>
<string name="hint_new_url">(empty for a new note)</string>
<string name="text_new_url">Link to share:</string>
<string name="text_url" translatable="false">Url:</string>
<string name="text_url">Url:</string>
<string name="text_url_hint">(leave empty for a new note)</string>
<string name="title">Title:</string>
<string name="title_hint">Title</string>
Expand Down Expand Up @@ -97,8 +97,8 @@
<string name="p_shaarli2mastodon" translatable="false">com.dimtion.shaarlier.shaarli2mastodon</string>
<string name="tweet">Tweet</string>
<string name="toot">Toot</string>
<string name="use_twitter">Use twitter (needs shaarli2twitter plugin)</string>
<string name="use_mastodon">Use mastodon (needs shaarli2mastodon plugin)</string>
<string name="use_twitter">Use twitter via shaarli2twitter (deprecated)</string>
<string name="use_mastodon">Use mastodon via shaarli2mastodon (deprecated)</string>
<string name="advanced">Advanced</string>
<string name="action_open_shaarli">Open Shaarli</string>
<string name="is_not_new_link">editing</string>
Expand Down

0 comments on commit c2f4f55

Please sign in to comment.