empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Signal-ize last remaining "data channel" and "push" string resources

Browse source 
Fixes #4730
Closes #4731
// FREEBIE
This commit is contained in:
Geonu Kang 2015-11-27 12:57:01 +09:00 • committed by Moxie Marlinspike
parent 2ab0029d49
commit 3319748926
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/layout/registration_progress_activity.xml
View file

@ -188,7 +188,7 @@
android:layout_below="@+id/connectivity_alert"
android:paddingLeft="4dip"
android:paddingRight="4dip"
android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_push_service" />
android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_server" />
</RelativeLayout>
<Button

8
res/values/strings.xml
View file

@ -231,7 +231,7 @@
<!-- GcmRefreshJob -->
<string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Signal communication failure!</string>
<string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was unable to register with Google Play Services. Communication over the data channel has been disabled, please try re-registering from the Signal settings menu.</string>
<string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was unable to register with Google Play Services. Signal messages and calls have been disabled, please try re-registering in Settings &gt; Advanced.</string>
<!-- GroupCreateActivity -->
<string name="GroupCreateActivity_actionbar_title">New group</string>
@ -239,7 +239,7 @@
<string name="GroupCreateActivity_group_name_hint">Group name</string>
<string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string>
<string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support Signal groups, so this group will be MMS.</string>
<string name="GroupCreateActivity_you_dont_support_push">You\'re not registered for using the data channel, so Signal groups are disabled.</string>
<string name="GroupCreateActivity_youre_not_registered_for_signal">You\'re not registered for Signal messages and calls, so Signal groups are disabled. Please try registering in Settings &gt; Advanced.</string>
<string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
<string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
<string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
@ -802,9 +802,7 @@
<string name="registration_progress_activity__call_me">Call me</string>
<string name="registration_progress_activity__edit_number">Edit number</string>
<string name="registration_progress_activity__connectivity_error">Connectivity error.</string>
<string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
Signal was unable to connect to the push service.
</string>
<string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal was unable to connect to the server.</string>
<string name="registration_progress_activity__some_possible_problems_include">Some possible
problems include:
</string>

2
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View file

@ -158,7 +158,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
@SuppressWarnings("ConstantConditions")
private void updateViewState() {
if (!TextSecurePreferences.isPushRegistered(this)) {
disableSignalGroupViews(R.string.GroupCreateActivity_you_dont_support_push);
disableSignalGroupViews(R.string.GroupCreateActivity_youre_not_registered_for_signal);
getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
} else if (getAdapter().hasNonPushMembers()) {
disableSignalGroupViews(R.string.GroupCreateActivity_contacts_dont_support_push);