TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 05:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace all strings containing 'TextSecure' with 'Signal'

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2015-09-23 13:35:18 -07:00
parent 7377e6c7da
commit 4044da849e
21 changed files with 98 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/RegistrationActivity.java
View File

@@ -58,7 +58,7 @@ public class RegistrationActivity extends BaseActionBarActivity {
super.onCreate(icicle);
setContentView(R.layout.registration_activity);
getSupportActionBar().setTitle(getString(R.string.RegistrationActivity_connect_with_textsecure));
getSupportActionBar().setTitle(getString(R.string.RegistrationActivity_connect_with_signal));
initializeResources();
initializeSpinner();

2
src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
View File

@@ -165,7 +165,7 @@ public class RegistrationProgressActivity extends BaseActionBarActivity {
private void initializeLinks() {
TextView failureText = (TextView) findViewById(R.id.sms_failed_text);
String pretext = getString(R.string.registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message);
String pretext = getString(R.string.registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message);
String link = getString(R.string.RegistrationProblemsActivity_possible_problems);
SpannableString spannableString = new SpannableString(pretext + " " + link);

3
src/org/thoughtcrime/securesms/TransportOptions.java
View File

@@ -1,7 +1,6 @@
package org.thoughtcrime.securesms;
import android.content.Context;
import android.content.res.TypedArray;
import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
import org.thoughtcrime.securesms.util.PushCharacterCalculator;
@@ -100,7 +99,7 @@ public class TransportOptions {
results.add(new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_push_white_24dp,
context.getResources().getColor(R.color.textsecure_primary),
context.getString(R.string.ConversationActivity_transport_textsecure),
context.getString(R.string.ConversationActivity_transport_signal),
context.getString(R.string.conversation_activity__type_message_push),
new PushCharacterCalculator()));

2
src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
View File

@@ -107,7 +107,7 @@ public class ContactSelectionListAdapter extends CursorAdapter
int contactType = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsDatabase.CONTACT_TYPE_COLUMN));
if (contactType == ContactsDatabase.PUSH_TYPE) holder.text.setText(R.string.contact_selection_list__header_textsecure_users);
if (contactType == ContactsDatabase.PUSH_TYPE) holder.text.setText(R.string.contact_selection_list__header_signal_users);
else holder.text.setText(R.string.contact_selection_list__header_other);
return convertView;

6
src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
View File

@@ -90,9 +90,9 @@ public class GcmRefreshJob extends ContextJob {
builder.setSmallIcon(R.drawable.icon_notification);
builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(),
R.drawable.ic_action_warning_red));
builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_TextSecure_communication_failure));
builder.setContentText(context.getString(R.string.GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services));
builder.setTicker(context.getString(R.string.GcmRefreshJob_Permanent_TextSecure_communication_failure));
builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure));
builder.setContentText(context.getString(R.string.GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services));
builder.setTicker(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure));
builder.setVibrate(new long[] {0, 1000});
builder.setContentIntent(pendingIntent);

6
src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@@ -67,7 +67,7 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
.asDrawable(context, recipient.getColor()
.toConversationColor(context)));
} else {
setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message));
setContentTitle(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message));
setLargeIcon(Recipient.getUnknownRecipient()
.getContactPhoto()
.asDrawable(context, Recipient.getUnknownRecipient()
@@ -133,9 +133,9 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil
if (privacy.isDisplayMessage()) {
setTicker(getStyledMessage(recipient, message));
} else if (privacy.isDisplayContact()) {
setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message)));
setTicker(getStyledMessage(recipient, context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message)));
} else {
setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_textsecure_message));
setTicker(context.getString(R.string.SingleRecipientNotificationBuilder_new_signal_message));
}
}

6
src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
View File

@@ -154,7 +154,7 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
private final CheckBoxPreference checkBoxPreference;
public DisablePushMessagesTask(final CheckBoxPreference checkBoxPreference) {
super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_from_textsecure_messages);
super(getActivity(), R.string.ApplicationPreferencesActivity_unregistering, R.string.ApplicationPreferencesActivity_unregistering_from_signal_messages);
this.checkBoxPreference = checkBoxPreference;
}
@@ -204,8 +204,8 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
if (((CheckBoxPreference)preference).isChecked()) {
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
builder.setIconAttribute(R.attr.dialog_info_icon);
builder.setTitle(R.string.ApplicationPreferencesActivity_disable_textsecure_messages);
builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_textsecure_messages);
builder.setTitle(R.string.ApplicationPreferencesActivity_disable_signal_messages);
builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_disable_signal_messages);
builder.setNegativeButton(android.R.string.cancel, null);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override

2
src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
View File

@@ -61,7 +61,7 @@ public class SmsMmsPreferenceFragment extends PreferenceFragment {
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, getActivity().getPackageName());
defaultPreference.setIntent(intent);
defaultPreference.setTitle(getString(R.string.ApplicationPreferencesActivity_sms_disabled));
defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app));
defaultPreference.setSummary(getString(R.string.ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app));
}
} else if (defaultPreference != null) {
preferenceScreen.removePreference(defaultPreference);

8
src/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@@ -44,9 +44,7 @@ import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
import org.thoughtcrime.securesms.jobs.MasterSecretDecryptJob;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.ParcelUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.jobqueue.EncryptionKeys;
import java.util.concurrent.TimeUnit;
@@ -240,7 +238,7 @@ public class KeyCachingService extends Service {
NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
builder.setContentTitle(getString(R.string.KeyCachingService_passphrase_cached));
builder.setContentText(getString(R.string.KeyCachingService_textsecure_passphrase_cached));
builder.setContentText(getString(R.string.KeyCachingService_signal_passphrase_cached));
builder.setSmallIcon(R.drawable.icon_cached);
builder.setWhen(0);
builder.setPriority(Notification.PRIORITY_MIN);
@@ -268,11 +266,11 @@ public class KeyCachingService extends Service {
private void foregroundServiceLegacy() {
Notification notification = new Notification(R.drawable.icon_cached,
getString(R.string.KeyCachingService_textsecure_passphrase_cached),
getString(R.string.KeyCachingService_signal_passphrase_cached),
System.currentTimeMillis());
notification.setLatestEventInfo(getApplicationContext(),
getString(R.string.KeyCachingService_passphrase_cached),
getString(R.string.KeyCachingService_textsecure_passphrase_cached),
getString(R.string.KeyCachingService_signal_passphrase_cached),
buildLaunchIntent());
notification.tickerText = null;

2
src/org/thoughtcrime/securesms/service/QuickResponseService.java
View File

@@ -38,7 +38,7 @@ public class QuickResponseService extends MasterSecretIntentService {
if (masterSecret == null) {
Log.w(TAG, "Got quick response request when locked...");
Toast.makeText(this, R.string.QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked, Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.QuickResponseService_quick_response_unavailable_when_Signal_is_locked, Toast.LENGTH_LONG).show();
return;
}

4
src/org/thoughtcrime/securesms/service/RegistrationService.java
View File

@@ -319,10 +319,10 @@ public class RegistrationService extends Service {
if (success) {
intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_complete));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_textsecure_registration_has_successfully_completed));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_signal_registration_has_successfully_completed));
} else {
intent.putExtra(NOTIFICATION_TITLE, getString(R.string.RegistrationService_registration_error));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_textsecure_registration_has_encountered_a_problem));
intent.putExtra(NOTIFICATION_TEXT, getString(R.string.RegistrationService_signal_registration_has_encountered_a_problem));
}
this.sendOrderedBroadcast(intent, null);