cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-psk: remove hostname from status message

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-02 13:07:24 +02:00
parent c6c1222eed
commit 5122c20e3d
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java
View File

@@ -224,10 +224,10 @@ public class TransferFragment extends Fragment implements TransferMvpView {
@Override @Override
public void showConnectionEstablished(String hostname) { public void showConnectionEstablished(String hostname) {
String statusText = getString(R.string.transfer_status_connected, hostname); // String statusText = getString(R.string.transfer_status_connected, hostname);
vConnectionStatusText1.setText(statusText); vConnectionStatusText1.setText(R.string.transfer_status_connected);
vConnectionStatusText2.setText(statusText); vConnectionStatusText2.setText(R.string.transfer_status_connected);
vConnectionStatusView1.setConnected(true); vConnectionStatusView1.setConnected(true);
vConnectionStatusView2.setConnected(true); vConnectionStatusView2.setConnected(true);

13
OpenKeychain/src/main/res/layout/transfer_fragment.xml
View File

@@ -8,7 +8,7 @@
android:id="@+id/transfer_animator" android:id="@+id/transfer_animator"
android:inAnimation="@anim/fade_in_delayed" android:inAnimation="@anim/fade_in_delayed"
android:outAnimation="@anim/fade_out" android:outAnimation="@anim/fade_out"
custom:initialView="05"> custom:initialView="03">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -158,8 +158,9 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:id="@+id/connection_status_1" android:id="@+id/connection_status_1"
tools:text="Connected to 123.456.123.123" android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Connected"/>
</RelativeLayout> </RelativeLayout>
@@ -248,8 +249,10 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:id="@+id/connection_status_2" android:id="@+id/connection_status_2"
tools:text="Connected to 123.456.123.123" android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium"
tools:text="Connected"
/>
</RelativeLayout> </RelativeLayout>

2
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1897,7 +1897,7 @@
<string name="section_received_keys">"Received keys"</string> <string name="section_received_keys">"Received keys"</string>
<string name="transfer_scan_only_wifi">"This feature can only be used on Wifi."</string> <string name="transfer_scan_only_wifi">"This feature can only be used on Wifi."</string>
<string name="button_import">"Import"</string> <string name="button_import">"Import"</string>
<string name="transfer_status_connected">"Connected to %s"</string> <string name="transfer_status_connected">"Connected"</string>
<string name="transfer_status_disconnected">"Disconnected!"</string> <string name="transfer_status_disconnected">"Disconnected!"</string>
<string name="transfer_error_read_incoming">"Failed reading incoming key!"</string> <string name="transfer_error_read_incoming">"Failed reading incoming key!"</string>
<string name="transfer_error_connect">"Connection failed!"</string> <string name="transfer_error_connect">"Connection failed!"</string>