From 9e82b64423fa935081a4035b1f6513cf342ace67 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 9 Mar 2017 17:37:24 +0100
Subject: [PATCH] Fix #4 - Toot URLs can be shared

---
 .../java/com/keylesspalace/tusky/SFragment.java    |  9 +++++++--
 .../com/keylesspalace/tusky/entity/Account.java    |  2 ++
 .../com/keylesspalace/tusky/entity/Status.java     | 14 ++++++++++++++
 app/src/main/res/menu/status_more.xml              |  6 +++---
 app/src/main/res/values/strings.xml                |  2 ++
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/SFragment.java
index e95d04cf2..15ac75061 100644
--- a/app/src/main/java/com/keylesspalace/tusky/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/SFragment.java
@@ -193,6 +193,7 @@ public class SFragment extends Fragment {
         final String accountId = status.getActionableStatus().account.id;
         final String accountUsename = status.getActionableStatus().account.username;
         final Spanned content = status.getActionableStatus().content;
+        final String statusUrl = status.getActionableStatus().url;
         PopupMenu popup = new PopupMenu(getContext(), view);
         // Give a different menu depending on whether this is the user's own toot or not.
         if (loggedInAccountId == null || !loggedInAccountId.equals(accountId)) {
@@ -205,8 +206,12 @@ public class SFragment extends Fragment {
                     @Override
                     public boolean onMenuItemClick(MenuItem item) {
                         switch (item.getItemId()) {
-                            case R.id.status_follow: {
-                                follow(accountId);
+                            case R.id.status_share: {
+                                Intent sendIntent = new Intent();
+                                sendIntent.setAction(Intent.ACTION_SEND);
+                                sendIntent.putExtra(Intent.EXTRA_TEXT, statusUrl);
+                                sendIntent.setType("text/plain");
+                                startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_status_to)));
                                 return true;
                             }
                             case R.id.status_block: {
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.java b/app/src/main/java/com/keylesspalace/tusky/entity/Account.java
index 6f03b0305..d091512ef 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.java
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.java
@@ -36,6 +36,8 @@ public class Account {
 
     public String header;
 
+    public boolean locked;
+
     @SerializedName("followers_count")
     public String followersCount;
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Status.java b/app/src/main/java/com/keylesspalace/tusky/entity/Status.java
index 72c6682e3..39378ee98 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Status.java
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Status.java
@@ -24,6 +24,20 @@ import java.util.Date;
 public class Status {
     private Status actionableStatus;
 
+    public String url;
+
+    @SerializedName("reblogs_count")
+    public String reblogsCount;
+
+    @SerializedName("favourites_count")
+    public String favouritesCount;
+
+    @SerializedName("in_reply_to_id")
+    public String inReplyToId;
+
+    @SerializedName("in_reply_to_account_id")
+    public String inReplyToAccountId;
+
     public String getActionableId() {
         return reblog == null ? id : reblog.id;
     }
diff --git a/app/src/main/res/menu/status_more.xml b/app/src/main/res/menu/status_more.xml
index 6886ea86e..33617c9d6 100644
--- a/app/src/main/res/menu/status_more.xml
+++ b/app/src/main/res/menu/status_more.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/status_follow"
-        android:title="@string/action_follow" />
+    <item
+        android:id="@+id/status_share"
+        android:title="@string/action_share"/>
     <item android:title="@string/action_block"
         android:id="@+id/status_block" />
     <item android:title="@string/action_report"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4fb113b85..fbbb22183 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,5 +156,7 @@
     <string name="action_photo_pick">Add media</string>
     <string name="action_compose_options">Privacy options</string>
     <string name="login_success">Welcome back!</string>
+    <string name="action_share">Share</string>
+    <string name="send_status_to">Share toot URL to...</string>
 
 </resources>