diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-09-27 19:45:36 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-09-27 19:45:36 +0200 |
| commit | f47e244675ee459e1495212ace602c43ac174728 (patch) | |
| tree | 746ee5de8219b3d4c60a62286f513be5b09ae2d3 /src/main/java/de/pixart/messenger/ui | |
| parent | 59dd2bb1c9b2be4c6b8802fbe0ee48085881d74d (diff) | |
fixed text sharing in direct sharing
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
4 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index d326058e7..e364c00bf 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -2278,7 +2278,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke private void processExtras(Bundle extras) { final String downloadUuid = extras.getString(ConversationsActivity.EXTRA_DOWNLOAD_UUID); - final String text = extras.getString(ConversationsActivity.EXTRA_TEXT); + final String text = extras.getString(Intent.EXTRA_TEXT); final String nick = extras.getString(ConversationsActivity.EXTRA_NICK); final boolean asQuote = extras.getBoolean(ConversationsActivity.EXTRA_AS_QUOTE); final boolean pm = extras.getBoolean(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, false); diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java index 8d8e5386a..2d07be344 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java @@ -105,7 +105,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW"; public static final String EXTRA_CONVERSATION = "conversationUuid"; public static final String EXTRA_DOWNLOAD_UUID = "de.pixart.messenger.download_uuid"; - public static final String EXTRA_TEXT = "text"; public static final String EXTRA_AS_QUOTE = "as_quote"; public static final String EXTRA_NICK = "nick"; public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm"; diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index da3d2ff8f..a5d64c820 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -174,7 +174,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); } else if (share.text != null) { intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION); - intent.putExtra(ConversationsActivity.EXTRA_TEXT, share.text); + intent.putExtra(Intent.EXTRA_TEXT, share.text); } startActivity(intent); finish(); diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index acb970e82..d01f29ac5 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -471,9 +471,9 @@ public abstract class XmppActivity extends ActionBarActivity { intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION); intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid()); if (text != null) { - intent.putExtra(ConversationsActivity.EXTRA_TEXT, text); + intent.putExtra(Intent.EXTRA_TEXT, text); if (asQuote) { - intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, asQuote); + intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, true); } } if (nick != null) { |