diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 9990c2573..f8fd9fe48 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -1,38 +1,14 @@ -/* - * Copyright (C) 2011 Whisper Systems - * Copyright (C) 2013-2017 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ package org.thoughtcrime.securesms; -import android.annotation.TargetApi; -import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.os.Build; -import android.os.Build.VERSION; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.core.app.NotificationManagerCompat; -import androidx.core.content.ContextCompat; -import androidx.core.graphics.drawable.DrawableCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; @@ -55,13 +31,6 @@ import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.qr.BackupTransferActivity; import org.thoughtcrime.securesms.util.ScreenLockUtil; -/** - * The Activity for application preference display and management. - * - * @author Moxie Marlinspike - * - */ - public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -197,35 +166,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA .setSummary(AdvancedPreferenceFragment.getVersion(getActivity())); } - @TargetApi(11) - private void tintIcons(Context context) { - Drawable notifications = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_notifications_white_24dp)); - Drawable swap = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_swap_vert_white_24dp)); - Drawable appearance = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_brightness_6_white_24dp)); - Drawable chats = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_forum_white_24dp)); - Drawable advanced = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_advanced_white_24dp)); - Drawable help = DrawableCompat.wrap(ContextCompat.getDrawable(context, R.drawable.ic_help_white_24dp)); - - int[] tintAttr = new int[]{R.attr.pref_icon_tint}; - TypedArray typedArray = context.obtainStyledAttributes(tintAttr); - int color = typedArray.getColor(0, 0x0); - typedArray.recycle(); - - DrawableCompat.setTint(notifications, color); - DrawableCompat.setTint(swap, color); - DrawableCompat.setTint(appearance, color); - DrawableCompat.setTint(chats, color); - DrawableCompat.setTint(advanced, color); - DrawableCompat.setTint(help, color); - - this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS).setIcon(notifications); - this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY).setIcon(swap); - this.findPreference(PREFERENCE_CATEGORY_APPEARANCE).setIcon(appearance); - this.findPreference(PREFERENCE_CATEGORY_CHATS).setIcon(chats); - this.findPreference(PREFERENCE_CATEGORY_ADVANCED).setIcon(advanced); - this.findPreference(PREFERENCE_CATEGORY_HELP).setIcon(help); - } - private class CategoryClickListener implements Preference.OnPreferenceClickListener { private final String category;