narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge pull request #1329 from hlad/server_info_http_upload

Browse source 
show HTTP upload availability on Edit account screen (server info)
This commit is contained in:
Daniel Gultsch 2015-08-15 13:58:48 +02:00
parent 81b7e27a46 4539643f27
commit 75bafd573e
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
private TextView mServerInfoCSI; private TextView mServerInfoCSI;
private TextView mServerInfoBlocking; private TextView mServerInfoBlocking;
private TextView mServerInfoPep; private TextView mServerInfoPep;
private TextView mServerInfoHttpUpload;
private TextView mSessionEst; private TextView mSessionEst;
private TextView mOtrFingerprint; private TextView mOtrFingerprint;
private TextView mAxolotlFingerprint; private TextView mAxolotlFingerprint;
@ -347,6 +348,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
this.mServerInfoBlocking = (TextView) findViewById(R.id.server_info_blocking); this.mServerInfoBlocking = (TextView) findViewById(R.id.server_info_blocking);
this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm); this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm);
this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep); this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep);
this.mServerInfoHttpUpload = (TextView) findViewById(R.id.server_info_http_upload);
this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint); this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint);
this.mOtrFingerprintBox = (RelativeLayout) findViewById(R.id.otr_fingerprint_box); this.mOtrFingerprintBox = (RelativeLayout) findViewById(R.id.otr_fingerprint_box);
this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard); this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard);
@ -542,6 +544,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
} else { } else {
this.mServerInfoPep.setText(R.string.server_info_unavailable); this.mServerInfoPep.setText(R.string.server_info_unavailable);
} }
if (features.httpUpload()) {
this.mServerInfoHttpUpload.setText(R.string.server_info_available);
} else {
this.mServerInfoHttpUpload.setText(R.string.server_info_unavailable);
}
final String otrFingerprint = this.mAccount.getOtrFingerprint(); final String otrFingerprint = this.mAccount.getOtrFingerprint();
if (otrFingerprint != null) { if (otrFingerprint != null) {
this.mOtrFingerprintBox.setVisibility(View.VISIBLE); this.mOtrFingerprintBox.setVisibility(View.VISIBLE);

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

@ -303,6 +303,26 @@
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/> tools:ignore="RtlHardcoded"/>
</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:text="@string/server_info_http_upload"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody" />
<TextView
android:id="@+id/server_info_http_upload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
tools:ignore="RtlHardcoded"/>
</TableRow>
</TableLayout> </TableLayout>
<RelativeLayout <RelativeLayout

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

@ -191,6 +191,7 @@
<string name="server_info_roster_version">XEP-0237: Roster Versioning</string> <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
<string name="server_info_stream_management">XEP-0198: Stream Management</string> <string name="server_info_stream_management">XEP-0198: Stream Management</string>
<string name="server_info_pep">XEP-0163: PEP (Avatars)</string> <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
<string name="server_info_http_upload">XEP-xxxx: HTTP File Upload</string>
<string name="server_info_available">available</string> <string name="server_info_available">available</string>
<string name="server_info_unavailable">unavailable</string> <string name="server_info_unavailable">unavailable</string>
<string name="missing_public_keys">Missing public key announcements</string> <string name="missing_public_keys">Missing public key announcements</string>