mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-31 01:01:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

show easy onboarding in profile details

Browse source
This commit is contained in:
Christian Schneppe 2020-12-22 21:13:10 +01:00
parent eac00aeffd
commit 43208fa088
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -68,6 +68,7 @@ import eu.siacs.conversations.ui.util.PendingItem;
import eu.siacs.conversations.ui.util.SoftKeyboardUtils; import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
import eu.siacs.conversations.utils.CharSequenceUtils; import eu.siacs.conversations.utils.CharSequenceUtils;
import eu.siacs.conversations.utils.CryptoHelper; import eu.siacs.conversations.utils.CryptoHelper;
import eu.siacs.conversations.utils.EasyOnboardingInvite;
import eu.siacs.conversations.utils.MenuDoubleTabUtil; import eu.siacs.conversations.utils.MenuDoubleTabUtil;
import eu.siacs.conversations.utils.Resolver; import eu.siacs.conversations.utils.Resolver;
import eu.siacs.conversations.utils.SignupUtils; import eu.siacs.conversations.utils.SignupUtils;
@ -1249,6 +1250,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} else { } else {
this.binding.serverInfoAdhocInvite.setText(R.string.server_info_unavailable); this.binding.serverInfoAdhocInvite.setText(R.string.server_info_unavailable);
} }
if (EasyOnboardingInvite.hasAccountSupport(this.mAccount)) {
this.binding.serverInfoAdhocInvite.setText(R.string.server_info_available);
} else {
this.binding.serverInfoAdhocInvite.setText(R.string.server_info_unavailable);
}
if (features.pep()) { if (features.pep()) {
AxolotlService axolotlService = this.mAccount.getAxolotlService(); AxolotlService axolotlService = this.mAccount.getAxolotlService();
if (axolotlService != null && axolotlService.isPepBroken()) { if (axolotlService != null && axolotlService.isPepBroken()) {

22
src/main/res/layout/activity_edit_account.xml
View file

@ -633,6 +633,28 @@
android:textAppearance="@style/TextAppearance.Conversations.Body1" /> android:textAppearance="@style/TextAppearance.Conversations.Body1" />
</TableRow> </TableRow>
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/server_info_easy_invite"
android:textAppearance="@style/TextAppearance.Conversations.Body1" />
<TextView
android:id="@+id/server_info_easy_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:paddingStart="4dp"
android:paddingLeft="4dp"
android:textAppearance="@style/TextAppearance.Conversations.Body1" />
</TableRow>
<TableRow <TableRow
android:id="@+id/push_row" android:id="@+id/push_row"
android:layout_width="fill_parent" android:layout_width="fill_parent"

1
src/main/res/values/strings.xml
View file

@ -1086,4 +1086,5 @@
<string name="easy_invite_share_text">Join %1$s and chat with me: %2$s</string> <string name="easy_invite_share_text">Join %1$s and chat with me: %2$s</string>
<string name="share_invite_with">Share invite with…</string> <string name="share_invite_with">Share invite with…</string>
<string name="no_active_accounts_support_this">No active accounts support this feature</string> <string name="no_active_accounts_support_this">No active accounts support this feature</string>
<string name="server_info_easy_invite">XEP-0401: Easy User Onboarding</string>
</resources> </resources>