From be873f203e289b589bcc9d74397159a6b540e38d Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 13 Feb 2019 09:30:45 +0100
Subject: [PATCH] Fix issue #805

---
 .../etalab/mastodon/drawers/NotificationsListAdapter.java     | 4 ++--
 .../fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java    | 4 ++--
 app/src/main/res/values/strings.xml                           | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
index 496e709be..54e068b92 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
@@ -748,10 +748,10 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                             case R.id.action_copy_link:
                                 clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
-                                clip = ClipData.newPlainText(Helper.CLIP_BOARD, status.getUrl());
+                                clip = ClipData.newPlainText(Helper.CLIP_BOARD, status.getReblog()!=null?status.getReblog().getUrl():status.getUrl());
                                 if (clipboard != null) {
                                     clipboard.setPrimaryClip(clip);
-                                    Toasty.info(context, context.getString(R.string.clipboard), Toast.LENGTH_LONG).show();
+                                    Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
                                 }
                                 return true;
                             case R.id.action_share:
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 5aa3f1a08..da4b6683a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -2048,10 +2048,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 case R.id.action_copy_link:
                                     clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
-                                    clip = ClipData.newPlainText(Helper.CLIP_BOARD, status.getUrl());
+                                    clip = ClipData.newPlainText(Helper.CLIP_BOARD, status.getReblog()!=null?status.getReblog().getUrl():status.getUrl());
                                     if (clipboard != null) {
                                         clipboard.setPrimaryClip(clip);
-                                        Toasty.info(context, context.getString(R.string.clipboard), Toast.LENGTH_LONG).show();
+                                        Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
                                     }
                                     return true;
                                 case R.id.action_share:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ab0d053ae..33d2aec98 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,7 @@
     <string name="toast_account_changed" formatted="false">Now works with the account %1$s</string>
     <string name="add_account">Add an account</string>
     <string name="clipboard">The content of the toot has been copied to the clipboard</string>
+    <string name="clipboard_url">The URL of the toot has been copied to the clipboard</string>
     <string name="change">Change</string>
     <string name="choose_picture">Select a picture…</string>
     <string name="clear">Clean</string>