From 75c98b98ddc064b759a06fc79097b254d733949c Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Thu, 11 Aug 2022 23:29:40 +0300 Subject: [PATCH] mb fix crash sdk 21+ --- .../com/aefyr/tsg/g2/NotificationsHelper.java | 4 +-- .../ru/vtosters/lite/deviceinfo/Device.java | 3 ++ .../lite/deviceinfo/DeviceInfoCollector.java | 5 +++- .../java/ru/vtosters/lite/foaf/FoafBase.java | 9 ++++-- .../ru/vtosters/lite/hooks/NewsfeedHook.java | 2 +- .../lite/ui/adapters/CategorizedAdapter.java | 8 +++--- .../lite/ui/adapters/ImagineArrayAdapter.java | 8 +++--- .../ui/adapters/MessagesPreviewAdapter.java | 1 - .../lite/ui/adapters/StickerPackAdapter.java | 19 +++++++------ .../lite/ui/components/CrashReporter.java | 10 +++---- .../ui/components/DockBarEditorManager.java | 26 +++++++++++++---- .../ui/components/IItemMovingListener.java | 1 - .../ui/components/SuperAppEditorManager.java | 28 +++++++++++++++---- .../vtosters/lite/ui/dialogs/OTADialog.java | 5 ++-- .../lite/ui/dialogs/ServerDialog.java | 2 -- .../ui/fragments/DockBarEditorFragment.java | 4 ++- .../tgstickers/StickersFragment.java | 4 +-- .../ui/wallpapers/WallpaperPreferences.java | 2 ++ .../ru/vtosters/lite/utils/FileUriUtils.java | 3 -- .../vtosters/lite/utils/LifecycleUtils.java | 7 +---- .../ru/vtosters/lite/utils/ThemesUtils.java | 8 ++++-- 21 files changed, 99 insertions(+), 60 deletions(-) diff --git a/app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java b/app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java index 1479a6bb7..ba0d341a6 100755 --- a/app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java +++ b/app/src/main/java/com/aefyr/tsg/g2/NotificationsHelper.java @@ -39,7 +39,7 @@ public class NotificationsHelper { downloadingPacksNotificationsIds = new HashMap<>(); if (oreo()) { - NotificationChannel notificationChan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "Сервис стикеров Telegram в VTosters", NotificationManager.IMPORTANCE_HIGH); + NotificationChannel notificationChan = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "Сервис стикеров Telegram в VTLite", NotificationManager.IMPORTANCE_HIGH); ((NotificationManager) c.getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(notificationChan); } } @@ -77,7 +77,7 @@ public class NotificationsHelper { Notification.Builder builder = commonBuilder(); builder.setProgress(0, 0, false); builder.setOngoing(false); - builder.setContentTitle("Сервис стикеров Telegram в VTosters"); + builder.setContentTitle("Сервис стикеров Telegram в VTLite"); String text; if (success) diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java index b6014d3ea..2f541e3fb 100644 --- a/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java +++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/Device.java @@ -1,5 +1,7 @@ package ru.vtosters.lite.deviceinfo; +import androidx.annotation.NonNull; + public class Device { private String androidId; private String bluetoothMac; @@ -86,6 +88,7 @@ public class Device { return this; } + @NonNull public String toString() { return "Device{serialId='" + this.serialId + "', androidId='" + this.androidId + "', wifiMac='" + this.wifiMac + "', bluetoothMac='" + this.bluetoothMac + "'}"; } diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/DeviceInfoCollector.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/DeviceInfoCollector.java index eb1097b8a..e3eb25ce8 100644 --- a/app/src/main/java/ru/vtosters/lite/deviceinfo/DeviceInfoCollector.java +++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/DeviceInfoCollector.java @@ -1,5 +1,6 @@ package ru.vtosters.lite.deviceinfo; +import android.annotation.SuppressLint; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.net.wifi.WifiInfo; @@ -28,6 +29,7 @@ public class DeviceInfoCollector { private String serialId() { String str; try { + @SuppressLint("PrivateApi") Class cls = Class.forName("android.os.SystemProperties"); Method method = cls.getMethod("get", String.class); str = (String) method.invoke(cls, "gsm.sn1"); @@ -53,6 +55,7 @@ public class DeviceInfoCollector { return null; } + @SuppressLint("HardwareIds") private String androidId(Context context) { return Settings.Secure.getString(context.getContentResolver(), "android_id").toLowerCase(); } @@ -99,7 +102,7 @@ public class DeviceInfoCollector { StringBuilder sb = new StringBuilder(); int length = hardwareAddress.length; for (int i = 0; i < length; i++) { - sb.append(String.format("%02X:", Byte.valueOf(hardwareAddress[i]))); + sb.append(String.format("%02X:", hardwareAddress[i])); } if (sb.length() > 0) { sb.deleteCharAt(sb.length() - 1); diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java index b26c1a4e3..ea859316b 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -8,6 +8,7 @@ import static ru.vtosters.lite.utils.AndroidUtils.getString; import static ru.vtosters.lite.utils.ProxyUtils.apiproxy; import static ru.vtosters.lite.utils.ProxyUtils.getApi; +import android.annotation.SuppressLint; import android.app.ProgressDialog; import android.content.Context; import android.util.Log; @@ -22,6 +23,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import java.util.Objects; import java.util.TimeZone; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; @@ -58,7 +60,7 @@ public class FoafBase { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US); sdf.setTimeZone(TimeZone.getTimeZone("Europe/Moscow")); - Date date = sdf.parse(matcher.group(1)); + Date date = sdf.parse(Objects.requireNonNull(matcher.group(1))); sdf.setTimeZone(TimeZone.getDefault()); return sdf.parse(sdf.format(date)).getTime() / 1000; } @@ -95,8 +97,8 @@ public class FoafBase { Matcher matcher2 = FOAF_REGEX_LOGIN.matcher(str); matcher.find(); matcher2.find(); - String normalHumanDate = getNormalHumanDate(matcher.group(1)); - getNormalHumanDate(matcher2.group(1)); + String normalHumanDate = getNormalHumanDate(Objects.requireNonNull(matcher.group(1))); + getNormalHumanDate(Objects.requireNonNull(matcher2.group(1))); VkAlertDialog.Builder a2 = new VkAlertDialog.Builder(context).setTitle(getIdentifier("addinf", "string")); a2.setMessage(getString("foafid") + " " + i + getString("foafregdate") + " " + normalHumanDate + getString("foafdate") + " " + daysPassedFromFoafDate(normalHumanDate)).setPositiveButton(17039370, null).create().show(); } catch (Exception e) { @@ -107,6 +109,7 @@ public class FoafBase { private static long daysPassedFromFoafDate(String str) { try { + @SuppressLint("SimpleDateFormat") Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(str.split(" ")[1]); return TimeUnit.DAYS.convert(new Date().getTime() - parse.getTime(), TimeUnit.MILLISECONDS); } catch (ParseException e) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java index 90a09f630..323bd21af 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java @@ -101,7 +101,7 @@ public class NewsfeedHook { return params.toArray(new String[0]); } - public static void adsParams(HashSet hashSet) { + public static void adsParams(HashSet hashSet) { if (ads() || adsslider()) { hashSet.add("ads_disabled"); return; diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java index 9220e785f..8626fc9eb 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/CategorizedAdapter.java @@ -34,10 +34,10 @@ public class CategorizedAdapter extends RecyclerView.Adapter { private List mItems = new ArrayList<>(); - private OnClickListener mListener; + private final OnClickListener mListener; private int mSelectedIndex = -1; public ImagineArrayAdapter(@NonNull Context context, OnClickListener listener) { @@ -134,8 +134,8 @@ public class ImagineArrayAdapter extends ArrayAdapter { - private static final int ME = 0x0; private static final int ANONYMOUS = -0x1; diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java index e038944ae..d3b0c6893 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/StickerPackAdapter.java @@ -7,6 +7,7 @@ import static ru.vtosters.lite.utils.ThemesUtils.getSTextAttr; import static ru.vtosters.lite.utils.ThemesUtils.getTextAttr; import static ru.vtosters.lite.utils.ThemesUtils.recolorDrawable; +import android.annotation.SuppressLint; import android.net.Uri; import android.view.LayoutInflater; import android.view.View; @@ -28,8 +29,9 @@ import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.utils.AndroidUtils; public class StickerPackAdapter extends RecyclerView.Adapter { - private static TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext()); + private static final TelegramStickersService sService = TelegramStickersService.getInstance(getGlobalContext()); + @SuppressLint("UseCompatLoadingForDrawables") @NonNull @Override public StickerPackViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { @@ -61,13 +63,13 @@ public class StickerPackAdapter extends RecyclerView.Adapter= Build.VERSION_CODES.KITKAT_WATCH) { - builder.addAction(new Notification.Action(0, getString("vtl_crash_upload"), PendingIntent.getActivity(getGlobalContext(), (int) (Math.random() * 100.0d), foxbinIntent, PendingIntent.FLAG_CANCEL_CURRENT))); - builder.addAction(new Notification.Action(0, getString("vtl_crash_save"), psaveLogIntent)); - } else { - builder.setContentIntent(PendingIntent.getActivity(activity, 0, foxbinIntent, PendingIntent.FLAG_ONE_SHOT)); - } + builder.addAction(new Notification.Action(0, getString("vtl_crash_upload"), PendingIntent.getActivity(getGlobalContext(), (int) (Math.random() * 100.0d), foxbinIntent, PendingIntent.FLAG_CANCEL_CURRENT))); + builder.addAction(new Notification.Action(0, getString("vtl_crash_save"), psaveLogIntent)); if (Build.VERSION.SDK_INT >= 26) { builder.setChannelId("crashes"); diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java index 36df13409..53a9cfb18 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/DockBarEditorManager.java @@ -10,6 +10,8 @@ import static ru.vtosters.lite.utils.Preferences.videonewcatalog; import static ru.vtosters.lite.utils.Preferences.vkme; import static ru.vtosters.lite.utils.Preferences.vkme_notifs; +import android.os.Build; + import com.vk.apps.AppsFragment; import com.vk.discover.ThemedFeedFragment; import com.vk.fave.fragments.FaveTabFragment; @@ -101,14 +103,28 @@ public class DockBarEditorManager { mSelectedTabs.add(getTabByTag(tag)); allTags.remove(tag); } - allTags.forEach(tag -> mDisabledTabs.add(getTabByTag(tag))); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + allTags.forEach(tag -> mDisabledTabs.add(getTabByTag(tag))); + } else { + for (String tag : allTags) { + mDisabledTabs.add(getTabByTag(tag)); + } + } } public void save() { - AndroidUtils.getPreferences().edit().putString("dockbar_tabs", mSelectedTabs.stream() - .map(tab -> tab.tag) - .collect(Collectors.joining(","))) - .commit(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + getPreferences().edit().putString("dockbar_tabs", mSelectedTabs.stream() + .map(tab -> tab.tag) + .collect(Collectors.joining(","))) + .commit(); + } else { + StringBuilder sb = new StringBuilder(); + for (DockBarTab tab : mSelectedTabs) { + sb.append(tab.tag).append(","); + } + getPreferences().edit().putString("dockbar_tabs", sb.toString()).commit(); + } } public void reset() { diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/IItemMovingListener.java b/app/src/main/java/ru/vtosters/lite/ui/components/IItemMovingListener.java index 8eb6b6ee7..a87b82c4f 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/IItemMovingListener.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/IItemMovingListener.java @@ -1,7 +1,6 @@ package ru.vtosters.lite.ui.components; public interface IItemMovingListener { - void onItemDismiss(int index); boolean onItemMove(int fromPosition, int toPosition); diff --git a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java index 740484ce4..3c3444f23 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java +++ b/app/src/main/java/ru/vtosters/lite/ui/components/SuperAppEditorManager.java @@ -2,11 +2,14 @@ package ru.vtosters.lite.ui.components; import static ru.vtosters.lite.utils.AndroidUtils.getPreferences; +import android.os.Build; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import ru.vtosters.lite.ui.items.DockBarTab; import ru.vtosters.lite.ui.items.SuperAppItem; import ru.vtosters.lite.utils.AndroidUtils; @@ -40,15 +43,30 @@ public class SuperAppEditorManager { mSelectedItems.add(getItemByTag(tag)); allTags.remove(tag); } - allTags.forEach(tag -> mDisabledItems.add(getItemByTag(tag))); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + allTags.forEach(tag -> mDisabledItems.add(getItemByTag(tag))); + } else { + for (String tag : allTags) { + mDisabledItems.add(getItemByTag(tag)); + } + } } public void save() { if (mSelectedItems.size() > 0) - getPreferences().edit().putString("superapp_items", mSelectedItems.stream() - .map(item -> item.type) - .collect(Collectors.joining(","))) - .commit(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + getPreferences().edit().putString("superapp_items", mSelectedItems.stream() + .map(item -> item.type) + .collect(Collectors.joining(","))) + .commit(); + } else { + StringBuilder sb = new StringBuilder(); + for (SuperAppItem item : mSelectedItems) { + sb.append(item.type); + sb.append(","); + } + getPreferences().edit().putString("superapp_items", sb.toString()).commit(); + } else reset(); } diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java index 92ee969ea..1d2f80505 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java @@ -9,7 +9,6 @@ import ru.vtosters.lite.ui.vkui.ModalBottomSheetWrapper; import ru.vtosters.lite.utils.OTAUtils; public class OTADialog implements OTAUtils.OTAListener { - private final Activity mActivity; private final OTAUtils mHelper; @@ -21,8 +20,8 @@ public class OTADialog implements OTAUtils.OTAListener { mHelper.loadData(); } - public static OTADialog checkUpdates(Activity activity) { - return new OTADialog(activity); + public static void checkUpdates(Activity activity) { + new OTADialog(activity); } @Override diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java index f278606ee..1672a6c2e 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/ServerDialog.java @@ -77,8 +77,6 @@ public class ServerDialog { private static void getResponse(String body) throws Exception { JSONObject jSONObject = new JSONObject(body); - Log.d("VTLOG", "getResponse: " + jSONObject); - if (jSONObject.getString("title").equals("")) { showAlert = false; return; diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java index 4af958de6..e976596b1 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/DockBarEditorFragment.java @@ -22,6 +22,8 @@ import androidx.recyclerview.widget.RecyclerView; import com.vtosters.lite.R; +import java.util.Objects; + import ru.vtosters.lite.ui.adapters.CategorizedAdapter; import ru.vtosters.lite.ui.components.DockBarEditorManager; import ru.vtosters.lite.ui.components.ItemMovingCallback; @@ -83,7 +85,7 @@ public class DockBarEditorFragment extends BaseToolbarFragment { }); adapter.setMinAndMaxCounts(DockBarEditorManager.MIN_SELECTED_TABS, DockBarEditorManager.MAX_SELECTED_TABS); - var recyclerView = new RecyclerView(getContext()); + var recyclerView = new RecyclerView(requireContext()); recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); recyclerView.setAdapter(adapter); recyclerView.setHasFixedSize(true); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java index d3bb91c90..fecab7839 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/tgstickers/StickersFragment.java @@ -40,6 +40,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.vk.navigation.Navigator; import java.io.File; +import java.util.Objects; import ru.vtosters.lite.tgs.TGPref; import ru.vtosters.lite.ui.adapters.StickerPackAdapter; @@ -47,7 +48,6 @@ import ru.vtosters.lite.ui.fragments.BaseToolbarFragment; import ru.vtosters.lite.utils.AndroidUtils; public class StickersFragment extends BaseToolbarFragment { - public final static String ACTION_RELOAD = "com.vtosters.lite.action.RELOAD_TGS_LIST"; private final static int TYPE_DIRECT = 0, TYPE_SOCKS = 2; @@ -147,7 +147,7 @@ public class StickersFragment extends BaseToolbarFragment { @Override public void onDestroyView() { super.onDestroyView(); - getContext().unregisterReceiver(mReceiver); + requireContext().unregisterReceiver(mReceiver); } private void fabClick() { diff --git a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperPreferences.java b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperPreferences.java index 58b326bab..df2329e4a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperPreferences.java +++ b/app/src/main/java/ru/vtosters/lite/ui/wallpapers/WallpaperPreferences.java @@ -5,6 +5,7 @@ import static ru.vtosters.lite.ui.wallpapers.WallpapersHooks.getWallpaperFile; import static ru.vtosters.lite.utils.AndroidUtils.dp2px; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.drawable.Drawable; import android.util.AttributeSet; @@ -64,6 +65,7 @@ public class WallpaperPreferences extends Preference { mChatBackground.setImageDrawable(null); } + @SuppressLint("NotifyDataSetChanged") void redraw() { mAdapter.notifyDataSetChanged(); requestBg(); diff --git a/app/src/main/java/ru/vtosters/lite/utils/FileUriUtils.java b/app/src/main/java/ru/vtosters/lite/utils/FileUriUtils.java index f808ffcc9..4c7ef068f 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/FileUriUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/FileUriUtils.java @@ -103,7 +103,6 @@ public final class FileUriUtils { } } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) private static String getVolumeIdFromTreeUri(final Uri treeUri) { final String docId = DocumentsContract.getTreeDocumentId(treeUri); final String[] split = docId.split(":"); @@ -111,8 +110,6 @@ public final class FileUriUtils { else return null; } - - @TargetApi(Build.VERSION_CODES.LOLLIPOP) private static String getDocumentPathFromTreeUri(final Uri treeUri) { final String docId = DocumentsContract.getTreeDocumentId(treeUri); final String[] split = docId.split(":"); diff --git a/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java b/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java index 47882cba5..ca9c6c6df 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/LifecycleUtils.java @@ -70,16 +70,11 @@ public class LifecycleUtils { public static void restartApplicationWithTimer() { Handler handler = new Handler(); - handler.postDelayed(new Runnable() { - public void run() { - restartApplication(); - } - }, 500); + handler.postDelayed(LifecycleUtils::restartApplication, 500); } public static void restartApplicationInto(Class Class) { Context ctx = AndroidUtils.getGlobalContext(); - PackageManager pm = ctx.getPackageManager(); Intent intent = new Navigator(Class).b(ctx); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java index 9cda8659e..60ecdf909 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -298,7 +298,11 @@ public class ThemesUtils { if (isColorRefAccented(i) && isAndroidMonet()) { return getAccentColor(); } - return context.getColor(i); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + return context.getColor(i); + } else { + return context.getResources().getColor(i); + } } // Android Support color injector + accent color checker public static int getColor2(int i) { @@ -352,7 +356,7 @@ public class ThemesUtils { } public static String hex(int i) { - return String.format("#%06X", Integer.valueOf(i & 16777215)); + return String.format("#%06X", i & 16777215); } // Get color as hex string public static int getNavigationHeight(int Default) {