diff options
| author | Andrew Comminos <andrew@comminos.com> | 2016-04-28 03:46:54 +0300 |
|---|---|---|
| committer | Andrew Comminos <andrew@comminos.com> | 2016-04-28 03:46:54 +0300 |
| commit | 8a20ec4e78e7adc0b17fea2188f295e794ce0fcf (patch) | |
| tree | ce8ff08bdef7fc36362a4f669c1a303aab0b9e63 | |
| parent | ddf36a291c1aff1268226f17884e17258569d370 (diff) | |
Initial implementation of channel linking.
| -rw-r--r-- | app/src/main/java/com/morlunk/mumbleclient/channel/ChannelMenu.java | 13 | ||||
| -rw-r--r-- | app/src/main/res/menu/context_channel.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| m--------- | libraries/Jumble | 0 |
4 files changed, 25 insertions, 0 deletions
diff --git a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelMenu.java b/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelMenu.java index 97d73e6..0e44628 100644 --- a/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelMenu.java +++ b/app/src/main/java/com/morlunk/mumbleclient/channel/ChannelMenu.java @@ -121,6 +121,19 @@ public class ChannelMenu implements PermissionsPopupMenu.IOnMenuPrepareListener, if(!pinned) mDatabase.addPinnedChannel(serverId, mChannel.getId()); else mDatabase.removePinnedChannel(serverId, mChannel.getId()); break; + case R.id.context_channel_link: { + IChannel channel = mService.getSessionChannel(); + mService.linkChannels(channel, mChannel); + break; + } + case R.id.context_channel_unlink: { + IChannel channel = mService.getSessionChannel(); + mService.unlinkChannels(channel, mChannel); + break; + } + case R.id.context_channel_unlink_all: + mService.unlinkAllChannels(mChannel); + break; default: return false; } diff --git a/app/src/main/res/menu/context_channel.xml b/app/src/main/res/menu/context_channel.xml index 4ff2d5c..88c7a8a 100644 --- a/app/src/main/res/menu/context_channel.xml +++ b/app/src/main/res/menu/context_channel.xml @@ -36,6 +36,15 @@ android:title="@string/remove" app:showAsAction="never" /> + <item android:id="@+id/context_channel_link" + android:title="@string/context_channel_link" + /> + <item android:id="@+id/context_channel_unlink" + android:title="@string/context_channel_unlink" + /> + <item android:id="@+id/context_channel_unlink_all" + android:title="@string/context_channel_unlink_all" + /> <item android:id="@+id/context_channel_view_description" android:title="@string/channel_menu_view_description" app:showAsAction="never" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b25ff61..c64364e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -260,4 +260,7 @@ <string name="error_writing_to_storage">Error writing to external storage.</string> <string name="export_success">Exported certificate to \'%s\'.</string> <string name="notification_unread_many">%d new messages</string> + <string name="context_channel_link">Link</string> + <string name="context_channel_unlink">Unlink</string> + <string name="context_channel_unlink_all">Unlink All</string> </resources> diff --git a/libraries/Jumble b/libraries/Jumble -Subproject 607255d01c1f50268cb44308c7c05a196212e75 +Subproject 04c75c4ed139f02c985eaf29ab544c05c222953 |