aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java9
-rw-r--r--src/main/res/values/themes.xml2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 9e88b5b76..119f06fc1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -445,13 +445,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
banFromConference.setVisible(true);
}
} else {
- if (jid != null && !jid.isBareJid()) {
- if (mConversation.getMucOptions().isUserInRoom(jid)) {
- sendPrivateMessage.setVisible(true);
- } else {
- sendPrivateMessage.setVisible(false);
- }
- }
+
+ sendPrivateMessage.setVisible(user.getRole().ranks(MucOptions.Role.VISITOR));
}
}
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5f8d5ab67..8a4b7f787 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -159,6 +159,8 @@
</style>
<style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light">
+ <item name="colorPrimary">@color/primary500</item>
+ <item name="colorPrimaryDark">@color/primary700</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>
<item name="android:windowFullscreen">true</item>