mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-26 23:25:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

Forwarding message to selected conversation

Browse source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2021-07-19 11:24:34 +02:00 committed by Andy Scherzinger
parent 6f75c25bbd
commit d67226e39d
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
6 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View file

@ -111,7 +111,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
if (intent.hasExtra(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
if (!router!!.hasRootController()) {
router!!.setRoot(
RouterTransaction.with(ConversationsListController())
RouterTransaction.with(ConversationsListController(Bundle()))
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler())
)
@ -121,7 +121,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
if (hasDb) {
if (userUtils.anyUserExists()) {
router!!.setRoot(
RouterTransaction.with(ConversationsListController())
RouterTransaction.with(ConversationsListController(Bundle()))
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler())
)
@ -174,7 +174,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
fun resetConversationsList() {
if (userUtils.anyUserExists()) {
router!!.setRoot(
RouterTransaction.with(ConversationsListController())
RouterTransaction.with(ConversationsListController(Bundle()))
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler())
)

4
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
View file

@ -443,7 +443,7 @@ public class AccountVerificationController extends BaseController {
getActivity().runOnUiThread(() -> {
if (userUtils.getUsers().size() == 1) {
getRouter().setRoot(RouterTransaction.with(new
ConversationsListController())
ConversationsListController(new Bundle()))
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler()));
} else {
@ -524,7 +524,7 @@ public class AccountVerificationController extends BaseController {
} else {
if (userUtils.anyUserExists()) {
getRouter().setRoot(RouterTransaction.with(new ConversationsListController())
getRouter().setRoot(RouterTransaction.with(new ConversationsListController(new Bundle()))
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler()));
} else {

8
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View file

@ -2165,6 +2165,14 @@ class ChatController(args: Bundle) :
clipboardManager.setPrimaryClip(clipData)
true
}
R.id.action_forward_message -> {
val bundle = Bundle()
bundle.putBoolean("forwardMessage", true)
getRouter().pushController(
RouterTransaction.with(ConversationsListController(bundle)).pushChangeHandler
(HorizontalChangeHandler()).popChangeHandler(HorizontalChangeHandler()))
true
}
R.id.action_reply_to_message -> {
val chatMessage = message as ChatMessage?
replyToMessage(chatMessage, message?.jsonMessageId)

15
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View file

@ -203,9 +203,12 @@ public class ConversationsListController extends BaseController implements Searc
private String textToPaste = "";
public ConversationsListController() {
private boolean forwardMessage = false;
public ConversationsListController(Bundle bundle) {
super();
setHasOptionsMenu(true);
forwardMessage = bundle.getBoolean("forwardMessage");
}
@Override
@ -340,9 +343,13 @@ public class ConversationsListController extends BaseController implements Searc
showShareToScreen = !shareToScreenWasShown && hasActivityActionSendIntent();
if (showShareToScreen) {
hideSearchBar();
getActionBar().setTitle(R.string.send_to_three_dots);
} else if (forwardMessage) {
hideSearchBar();
getActionBar().setTitle(R.string.nc_forward_to_three_dots);
} else {
MainActivity activity = (MainActivity) getActivity();
@ -752,6 +759,8 @@ public class ConversationsListController extends BaseController implements Searc
if (showShareToScreen) {
shareToScreenWasShown = true;
handleSharedData();
}else if (forwardMessage) {
forwardMessage();
} else {
openConversation();
}
@ -759,6 +768,10 @@ public class ConversationsListController extends BaseController implements Searc
return true;
}
private void forwardMessage() {
System.out.println("Add code to forward a message here");
}
private void handleSharedData() {
collectDataFromIntent();
if (!textToPaste.isEmpty()) {

6
app/src/main/res/menu/chat_message_menu.xml
View file

@ -8,6 +8,12 @@
android:title="@string/nc_copy_message"
app:showAsAction="always" />
<item
android:id="@+id/action_forward_message"
android:icon="@drawable/ic_content_copy"
android:title="@string/nc_forward_message"
app:showAsAction="always" />
<item
android:id="@+id/action_reply_to_message"
android:icon="@drawable/ic_reply"

3
app/src/main/res/values/strings.xml
View file

@ -189,6 +189,8 @@
<string name="nc_add_to_favorites">Add to favorites</string>
<string name="nc_remove_from_favorites">Remove from favorites</string>
<string name="nc_forward_to_three_dots">Forward to …</string>
<!-- Contacts -->
<string name="nc_select_participants">Select participants</string>
<string name="nc_add_participants">Add participants</string>
@ -357,6 +359,7 @@
<!-- Chat -->
<string name="nc_copy_message">Copy</string>
<string name="nc_forward_message">Forward</string>
<string name="nc_reply">Reply</string>
<string name="nc_reply_privately">Reply privately</string>
<string name="nc_delete_message">Delete</string>