diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml index 103206d734..92818b1006 100644 --- a/res/layout/conversation_list_activity.xml +++ b/res/layout/conversation_list_activity.xml @@ -37,7 +37,6 @@ android:textSize="25sp" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_toStartOf="@+id/search_action" android:layout_marginStart="66dp"/> diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml index 532605c577..fbcc588fc2 100644 --- a/res/layout/profile_create_activity.xml +++ b/res/layout/profile_create_activity.xml @@ -30,7 +30,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="32dp" android:layout_marginEnd="8dp" - android:text="@string/CreateProfileActivity_set_up_your_profile" + android:text="@string/activity_profile_title" app:layout_constraintBottom_toTopOf="@+id/name" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -43,6 +43,7 @@ android:id="@+id/avatar_background" android:layout_width="80dp" android:layout_height="80dp" + android:visibility="gone" android:layout_marginStart="32dp" android:layout_marginTop="4dp" android:src="@drawable/circle_tintable" @@ -55,6 +56,7 @@ android:id="@+id/avatar_placeholder" android:layout_width="0dp" android:layout_height="0dp" + android:visibility="gone" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:src="@drawable/ic_profile_default" @@ -69,6 +71,7 @@ android:id="@+id/avatar" android:layout_width="0dp" android:layout_height="0dp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/avatar_background" app:layout_constraintEnd_toEndOf="@+id/avatar_background" app:layout_constraintStart_toStartOf="@+id/avatar_background" @@ -78,6 +81,7 @@ android:id="@+id/camera_icon" android:layout_width="60dp" android:layout_height="60dp" + android:visibility="gone" android:layout_marginStart="35dp" android:layout_marginTop="35dp" android:cropToPadding="false" @@ -90,18 +94,18 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" + android:layout_marginStart="49dp" android:layout_marginTop="24dp" android:layout_marginEnd="4dp" android:layout_weight="1" - android:hint="@string/profile_create_activity__your_name" + android:hint="@string/activity_profile_display_name_edit_text_hint" app:labeledEditText_background="?attr/conversation_background" - app:labeledEditText_label="@string/CreateProfileActivity_profile_name" + app:labeledEditText_label="@string/activity_profile_display_name_edit_text_description" app:labeledEditText_textLayout="@layout/profile_name_text" app:layout_constraintBottom_toTopOf="@+id/description_text" app:layout_constraintEnd_toStartOf="@+id/emoji_toggle" app:layout_constraintHorizontal_bias="0.5" - app:layout_constraintStart_toEndOf="@+id/avatar_background" + app:layout_constraintStart_toStartOf="@+id/avatar_background" app:layout_constraintTop_toBottomOf="@+id/title" /> - - + android:layout_marginStart="32dp" + android:layout_marginTop="32dp" + android:layout_marginEnd="32dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" + android:textAlignment="center" + android:text="@string/activity_landing_title" /> - Signal + Loki Messenger Yes No Delete @@ -1234,7 +1234,7 @@ Request a delivery report for each SMS message you send Automatically delete older messages once a conversation exceeds a specified length Delete old messages - Chats and media + Chats Conversation length limit Trim all conversations now Scan through all conversations and enforce conversation length limits @@ -1261,12 +1261,12 @@ When using Wi-Fi When roaming Media auto-download - Message trimming + Message Trimming Use system emoji Disable Signal\'s built-in emoji support Relay all calls through the Signal server to avoid revealing your IP address to your contact. Enabling will reduce call quality. Always relay calls - App access + App Access Communication Chats Messages @@ -1476,7 +1476,7 @@ Never Unknown Screen lock - Lock Signal access with Android screen lock or fingerprint + Lock Loki Messenger access with Android screen lock or fingerprint Screen lock inactivity timeout None The Registration Lock PIN is not the same as the SMS verification code you just received. Please enter the PIN you previously configured in the application. @@ -1519,6 +1519,10 @@ + + Loki Messenger + Loki Messenger needs access to your storage to securely exchange messages. + Privacy Policy Create Your Loki Messenger Account Enter a name to be shown to your contacts @@ -1536,6 +1540,13 @@ Copy OK Copied to Clipboard + + Set Your Display Name + Your Display Name + Display Name + + Notification Style + Notification Content Search by name or public key diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index a88542804b..5eeb3568f7 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -5,9 +5,9 @@ - + android:icon="@drawable/ic_textsms_24dp"/> --> - + android:icon="@drawable/ic_brightness_6_24dp"/> --> - + android:icon="@drawable/ic_advanced_24dp"/> --> - + android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/> --> - + + - + diff --git a/res/xml/preferences_chats.xml b/res/xml/preferences_chats.xml index bf176d21af..623b16a03d 100644 --- a/res/xml/preferences_chats.xml +++ b/res/xml/preferences_chats.xml @@ -2,7 +2,7 @@ - + - + android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" /> --> - + - + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index ddd0871c2a..a7821f5cc2 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -40,13 +40,10 @@ import android.support.v7.preference.Preference; import android.widget.Toast; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; -import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; -import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment; import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment; import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment; import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment; -import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment; import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference; import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.DynamicLanguage; @@ -71,13 +68,13 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName(); private static final String PREFERENCE_CATEGORY_PROFILE = "preference_category_profile"; - private static final String PREFERENCE_CATEGORY_SMS_MMS = "preference_category_sms_mms"; + // private static final String PREFERENCE_CATEGORY_SMS_MMS = "preference_category_sms_mms"; private static final String PREFERENCE_CATEGORY_NOTIFICATIONS = "preference_category_notifications"; private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection"; - private static final String PREFERENCE_CATEGORY_APPEARANCE = "preference_category_appearance"; + // private static final String PREFERENCE_CATEGORY_APPEARANCE = "preference_category_appearance"; private static final String PREFERENCE_CATEGORY_CHATS = "preference_category_chats"; - private static final String PREFERENCE_CATEGORY_DEVICES = "preference_category_devices"; - private static final String PREFERENCE_CATEGORY_ADVANCED = "preference_category_advanced"; + // private static final String PREFERENCE_CATEGORY_DEVICES = "preference_category_devices"; + // private static final String PREFERENCE_CATEGORY_ADVANCED = "preference_category_advanced"; private static final String PREFERENCE_CATEGORY_PUBLIC_KEY = "preference_category_public_key"; private static final String PREFERENCE_CATEGORY_SEED = "preference_category_seed"; @@ -152,20 +149,26 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA this.findPreference(PREFERENCE_CATEGORY_PROFILE) .setOnPreferenceClickListener(new ProfileClickListener()); + /* this.findPreference(PREFERENCE_CATEGORY_SMS_MMS) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS)); + */ this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS)); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION)); + /* this.findPreference(PREFERENCE_CATEGORY_APPEARANCE) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE)); + */ this.findPreference(PREFERENCE_CATEGORY_CHATS) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS)); + /* this.findPreference(PREFERENCE_CATEGORY_DEVICES) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES)); this.findPreference(PREFERENCE_CATEGORY_ADVANCED) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED)); + */ this.findPreference(PREFERENCE_CATEGORY_PUBLIC_KEY) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_PUBLIC_KEY)); this.findPreference(PREFERENCE_CATEGORY_SEED) @@ -193,23 +196,29 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA private void setCategorySummaries() { ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh(); + /* this.findPreference(PREFERENCE_CATEGORY_SMS_MMS) .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity())); + */ this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS) .setSummary(NotificationsPreferenceFragment.getSummary(getActivity())); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION) .setSummary(AppProtectionPreferenceFragment.getSummary(getActivity())); + /* this.findPreference(PREFERENCE_CATEGORY_APPEARANCE) .setSummary(AppearancePreferenceFragment.getSummary(getActivity())); + */ this.findPreference(PREFERENCE_CATEGORY_CHATS) .setSummary(ChatsPreferenceFragment.getSummary(getActivity())); } private void setCategoryVisibility() { + /* Preference devicePreference = this.findPreference(PREFERENCE_CATEGORY_DEVICES); if (devicePreference != null && !TextSecurePreferences.isPushRegistered(getActivity())) { getPreferenceScreen().removePreference(devicePreference); } + */ } @TargetApi(11) @@ -239,13 +248,13 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA DrawableCompat.setTint(publicKey, color); DrawableCompat.setTint(seed, color); - this.findPreference(PREFERENCE_CATEGORY_SMS_MMS).setIcon(sms); + // this.findPreference(PREFERENCE_CATEGORY_SMS_MMS).setIcon(sms); this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS).setIcon(notifications); this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION).setIcon(privacy); - this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance); + // this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance); this.findPreference(PREFERENCE_CATEGORY_CHATS).setIcon(chats); - this.findPreference(PREFERENCE_CATEGORY_DEVICES).setIcon(devices); - this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced); + // this.findPreference(PREFERENCE_CATEGORY_DEVICES).setIcon(devices); + // this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced); this.findPreference(PREFERENCE_CATEGORY_PUBLIC_KEY).setIcon(publicKey); this.findPreference(PREFERENCE_CATEGORY_SEED).setIcon(seed); } @@ -262,21 +271,26 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA Fragment fragment = null; switch (category) { + /* case PREFERENCE_CATEGORY_SMS_MMS: fragment = new SmsMmsPreferenceFragment(); break; + */ case PREFERENCE_CATEGORY_NOTIFICATIONS: fragment = new NotificationsPreferenceFragment(); break; case PREFERENCE_CATEGORY_APP_PROTECTION: fragment = new AppProtectionPreferenceFragment(); break; + /* case PREFERENCE_CATEGORY_APPEARANCE: fragment = new AppearancePreferenceFragment(); break; + */ case PREFERENCE_CATEGORY_CHATS: fragment = new ChatsPreferenceFragment(); break; + /* case PREFERENCE_CATEGORY_DEVICES: Intent intent = new Intent(getActivity(), DeviceActivity.class); startActivity(intent); @@ -284,6 +298,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA case PREFERENCE_CATEGORY_ADVANCED: fragment = new AdvancedPreferenceFragment(); break; + */ case PREFERENCE_CATEGORY_PUBLIC_KEY: String hexEncodedPublicKey = TextSecurePreferences.getLocalNumber(getContext()); Intent shareIntent = new Intent(); diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 8eef67498d..d042571b1e 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -30,7 +30,6 @@ import android.support.v7.widget.Toolbar; import android.support.v7.widget.TooltipCompat; import android.text.TextUtils; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.ViewGroup; import android.widget.ImageView; @@ -124,6 +123,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit @Override public boolean onPrepareOptionsMenu(Menu menu) { + return false; + /* MenuInflater inflater = this.getMenuInflater(); menu.clear(); @@ -133,6 +134,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit super.onPrepareOptionsMenu(menu); return true; + */ } private void initializeSearchListener() { diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 8957eef761..eaaf27cc4f 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -360,7 +360,7 @@ public class ConversationListFragment extends Fragment public void onLoadFinished(Loader arg0, Cursor cursor) { if ((cursor == null || cursor.getCount() <= 0) && TextUtils.isEmpty(queryFilter) && !archive) { list.setVisibility(View.INVISIBLE); - emptyState.setVisibility(View.VISIBLE); + emptyState.setVisibility(View.GONE); emptySearch.setVisibility(View.INVISIBLE); emptyImage.setImageResource(EMPTY_IMAGES[(int) (Math.random() * EMPTY_IMAGES.length)]); fab.startPulse(3 * 1000); diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index aa85a68d9a..e1932a871e 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -35,8 +35,8 @@ import mobi.upod.timedurationpicker.TimeDurationPickerDialog; public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment implements InjectableType { - private static final String PREFERENCE_CATEGORY_BLOCKED = "preference_category_blocked"; - private static final String PREFERENCE_UNIDENTIFIED_LEARN_MORE = "pref_unidentified_learn_more"; + // private static final String PREFERENCE_CATEGORY_BLOCKED = "preference_category_blocked"; + // private static final String PREFERENCE_UNIDENTIFIED_LEARN_MORE = "pref_unidentified_learn_more"; private CheckBoxPreference disablePassphrase; @@ -55,7 +55,7 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment disablePassphrase = (CheckBoxPreference) this.findPreference("pref_enable_passphrase_temporary"); - this.findPreference(TextSecurePreferences.REGISTRATION_LOCK_PREF).setOnPreferenceClickListener(new AccountLockClickListener()); + // this.findPreference(TextSecurePreferences.REGISTRATION_LOCK_PREF).setOnPreferenceClickListener(new AccountLockClickListener()); this.findPreference(TextSecurePreferences.SCREEN_LOCK).setOnPreferenceChangeListener(new ScreenLockListener()); this.findPreference(TextSecurePreferences.SCREEN_LOCK_TIMEOUT).setOnPreferenceClickListener(new ScreenLockTimeoutListener()); @@ -64,10 +64,10 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment this.findPreference(TextSecurePreferences.READ_RECEIPTS_PREF).setOnPreferenceChangeListener(new ReadReceiptToggleListener()); this.findPreference(TextSecurePreferences.TYPING_INDICATORS).setOnPreferenceChangeListener(new TypingIndicatorsToggleListener()); this.findPreference(TextSecurePreferences.LINK_PREVIEWS).setOnPreferenceChangeListener(new LinkPreviewToggleListener()); - this.findPreference(PREFERENCE_CATEGORY_BLOCKED).setOnPreferenceClickListener(new BlockedContactsClickListener()); - this.findPreference(TextSecurePreferences.SHOW_UNIDENTIFIED_DELIVERY_INDICATORS).setOnPreferenceChangeListener(new ShowUnidentifiedDeliveryIndicatorsChangedListener()); - this.findPreference(TextSecurePreferences.UNIVERSAL_UNIDENTIFIED_ACCESS).setOnPreferenceChangeListener(new UniversalUnidentifiedAccessChangedListener()); - this.findPreference(PREFERENCE_UNIDENTIFIED_LEARN_MORE).setOnPreferenceClickListener(new UnidentifiedLearnMoreClickListener()); + // this.findPreference(PREFERENCE_CATEGORY_BLOCKED).setOnPreferenceClickListener(new BlockedContactsClickListener()); + // this.findPreference(TextSecurePreferences.SHOW_UNIDENTIFIED_DELIVERY_INDICATORS).setOnPreferenceChangeListener(new ShowUnidentifiedDeliveryIndicatorsChangedListener()); + // this.findPreference(TextSecurePreferences.UNIVERSAL_UNIDENTIFIED_ACCESS).setOnPreferenceChangeListener(new UniversalUnidentifiedAccessChangedListener()); + // this.findPreference(PREFERENCE_UNIDENTIFIED_LEARN_MORE).setOnPreferenceClickListener(new UnidentifiedLearnMoreClickListener()); disablePassphrase.setOnPreferenceChangeListener(new DisablePassphraseClickListener()); initializeVisibility(); diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index 05d4999a4d..c89a347c25 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -42,12 +42,14 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { public void onCreate(Bundle paramBundle) { super.onCreate(paramBundle); + /* findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_MOBILE_PREF) .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_WIFI_PREF) .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF) .setOnPreferenceChangeListener(new MediaDownloadChangeListener()); + */ findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF) .setOnPreferenceChangeListener(new ListSummaryListener()); @@ -111,12 +113,14 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { } private void setMediaDownloadSummaries() { + /* findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_MOBILE_PREF) .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getMobileMediaDownloadAllowed(getActivity()))); findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_WIFI_PREF) .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getWifiMediaDownloadAllowed(getActivity()))); findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF) .setSummary(getSummaryForMediaPreference(TextSecurePreferences.getRoamingMediaDownloadAllowed(getActivity()))); + */ } private CharSequence getSummaryForMediaPreference(Set allowedNetworks) { diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java index 54ce541076..e8c7046a7d 100644 --- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java @@ -54,8 +54,10 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme .setOnPreferenceChangeListener(new NotificationPrivacyListener()); this.findPreference(TextSecurePreferences.NOTIFICATION_PRIORITY_PREF) .setOnPreferenceChangeListener(new ListSummaryListener()); + /* this.findPreference(TextSecurePreferences.CALL_RINGTONE_PREF) .setOnPreferenceChangeListener(new RingtoneSummaryListener()); + */ this.findPreference(TextSecurePreferences.VIBRATE_PREF) .setOnPreferenceChangeListener((preference, newValue) -> { NotificationChannels.updateMessageVibrate(getContext(), (boolean) newValue); @@ -78,6 +80,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme return true; }); + /* this.findPreference(TextSecurePreferences.CALL_RINGTONE_PREF) .setOnPreferenceClickListener(preference -> { Uri current = TextSecurePreferences.getCallNotificationRingtone(getContext()); @@ -93,6 +96,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme return true; }); + */ initializeListSummary((ListPreference) findPreference(TextSecurePreferences.LED_COLOR_PREF)); initializeListSummary((ListPreference) findPreference(TextSecurePreferences.REPEAT_ALERTS_PREF)); @@ -112,9 +116,9 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme } initializeRingtoneSummary(findPreference(TextSecurePreferences.RINGTONE_PREF)); - initializeCallRingtoneSummary(findPreference(TextSecurePreferences.CALL_RINGTONE_PREF)); + // initializeCallRingtoneSummary(findPreference(TextSecurePreferences.CALL_RINGTONE_PREF)); initializeMessageVibrateSummary((SwitchPreferenceCompat)findPreference(TextSecurePreferences.VIBRATE_PREF)); - initializeCallVibrateSummary((SwitchPreferenceCompat)findPreference(TextSecurePreferences.CALL_VIBRATE_PREF)); + // initializeCallVibrateSummary((SwitchPreferenceCompat)findPreference(TextSecurePreferences.CALL_VIBRATE_PREF)); } @Override @@ -152,7 +156,7 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme TextSecurePreferences.setCallNotificationRingtone(getContext(), uri != null ? uri.toString() : Uri.EMPTY.toString()); } - initializeCallRingtoneSummary(findPreference(TextSecurePreferences.CALL_RINGTONE_PREF)); + // initializeCallRingtoneSummary(findPreference(TextSecurePreferences.CALL_RINGTONE_PREF)); } } diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java index 156546615a..3b61f41c9b 100644 --- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.registration; import android.Manifest; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; @@ -28,17 +27,14 @@ public class WelcomeActivity extends BaseActionBarActivity { } private void onTermsClicked() { - CommunicationActions.openBrowserLink(this, "https://signal.org/legal"); + CommunicationActions.openBrowserLink(this, "https://github.com/loki-project/loki-messenger-android/blob/master/privacy-policy.md"); } private void onContinueClicked() { Permissions.with(this) - .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS, - Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE, - Manifest.permission.READ_PHONE_STATE) + .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE) .ifNecessary() - .withRationaleDialog(getString(R.string.RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends), - R.drawable.ic_contacts_white_48dp, R.drawable.ic_folder_white_48dp) + .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_folder_white_48dp) .onAnyResult(() -> { TextSecurePreferences.setHasSeenWelcomeScreen(WelcomeActivity.this, true);