diff --git a/app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java b/app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java index a20eaa1ed..60d4b58e8 100644 --- a/app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java +++ b/app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java @@ -25,14 +25,15 @@ public class VTExecutors { } static class VTMusicDownloadExecutor { - private VTMusicDownloadExecutor() {} - - private static class LazyHolder { - public static final ExecutorService INSTANCE = Executors.newSingleThreadExecutor(); + private VTMusicDownloadExecutor() { } public static ExecutorService getInstance() { return LazyHolder.INSTANCE; } + + private static class LazyHolder { + public static final ExecutorService INSTANCE = Executors.newSingleThreadExecutor(); + } } } diff --git a/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java b/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java index 4610c69dc..42d71fb47 100644 --- a/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java +++ b/app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java @@ -70,8 +70,8 @@ public class OEMDetector { } } - public static boolean isIntentResolved(Context ctx, Intent intent ){ - return (intent!=null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null); + public static boolean isIntentResolved(Context ctx, Intent intent) { + return (intent != null && ctx.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) != null); } public static boolean detectMiuiV2() { diff --git a/app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java b/app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java index cff9f0a72..a7fe261aa 100644 --- a/app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java +++ b/app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java @@ -3,11 +3,11 @@ package ru.vtosters.lite.di.singleton; import okhttp3.OkHttpClient; public class VtOkHttpClient extends OkHttpClient { - private static class LazyHolder { - private static final VtOkHttpClient instance = new VtOkHttpClient(); - } - public static VtOkHttpClient getInstance() { return LazyHolder.instance; } + + private static class LazyHolder { + private static final VtOkHttpClient instance = new VtOkHttpClient(); + } } diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java index 9962fdfad..c2bfffc3f 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java @@ -329,10 +329,10 @@ public class MessagesDownloader { "\n" + ""; - return "" - + AndroidUtils.getString(R.string.chat_export_title) - + ""; } diff --git a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java index cf5f0187d..6cb08a35d 100644 --- a/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java +++ b/app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java @@ -93,7 +93,7 @@ public class EncryptProvider { public static CharSequence decryptMessage(CharSequence msgBody, MsgFromUser msgFromUser, boolean showEmoji) { try { return decryptMessage((String) msgBody, msgFromUser.v1(), showEmoji); - } catch (Exception e){ + } catch (Exception e) { return decryptMessage((String) msgBody, 0, showEmoji); } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java index c53fea758..b1614f61b 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java @@ -83,7 +83,7 @@ public class DockBarInjector { } } catch (NoSuchFieldException | IllegalAccessException | ClassNotFoundException | - NoSuchMethodException | InvocationTargetException e) { + NoSuchMethodException | InvocationTargetException e) { e.printStackTrace(); } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java index 82d920a5e..cd8bc611c 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -232,7 +232,6 @@ public class JsonInjectors { } - public static JSONObject setOnlineInfo(JSONObject json) throws JSONException { var id = json.optInt("id"); if (id == AccountManagerUtils.getUserId()) { diff --git a/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java b/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java index 6eb79ff8f..e7b3522e7 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java @@ -3,7 +3,7 @@ package ru.vtosters.lite.hooks; import static ru.vtosters.lite.utils.Preferences.getBoolValue; public class PromoStickersHook { - public static String hook(){ + public static String hook() { return getBoolValue("promotedstickers", true) ? "purchased,active" : "purchased,active,promoted"; } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java index 9c5445bfd..ef71792c1 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java @@ -70,11 +70,11 @@ public class ProxyHook { rgRandomProxy.setChecked(isRandomProxyEnabled()); rgVika.setChecked(isVikaProxyEnabled()); - new VkAlertDialog.Builder(ctx) - .setTitle(ctx.getString(R.string.vtlproxy)) - .setMessage(ctx.getString(R.string.proxy_warning)) - .setView(rg) - .setPositiveButton(ctx.getString(R.string.vtl_confirm), ((dialog, which) -> { // Применить + new VkAlertDialog.Builder(ctx) + .setTitle(ctx.getString(R.string.vtlproxy)) + .setMessage(ctx.getString(R.string.proxy_warning)) + .setView(rg) + .setPositiveButton(ctx.getString(R.string.vtl_confirm), ((dialog, which) -> { // Применить if (rgZaborona.isChecked()) { edit().putString("proxy", "zaborona").commit(); restartApplication(); @@ -88,13 +88,13 @@ public class ProxyHook { edit().putString("proxy", "noproxy").commit(); restartApplication(); } - })) - .setNeutralButton(ctx.getString(R.string.proxy_settings), ((dialog, which) -> { + })) + .setNeutralButton(ctx.getString(R.string.proxy_settings), ((dialog, which) -> { var intent = new Navigator(ProxySettingsFragment.class) .b(ctx) .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); ctx.startActivity(intent); - })) - .show(); + })) + .show(); } } diff --git a/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java b/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java index 79b262e67..4c1313d73 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java @@ -8,7 +8,7 @@ import ru.vtosters.lite.utils.ThemesUtils; public class WritebarHook { public static int getWriteBar() { - return wbios() ? R.layout.write_bar_i : R.layout.write_bar; + return wbios() ? R.layout.write_bar_i : R.layout.write_bar; } public static int getIconsColors(int def) { diff --git a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java index b9c7a9f5c..70fe7e201 100644 --- a/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java +++ b/app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java @@ -56,7 +56,7 @@ public class LastFMScrobbler { } if (Preferences.autocache() && !CacheDatabaseDelegate.isCached(uid)) { - if (LibVKXClient.isIntegrationEnabled()){ + if (LibVKXClient.isIntegrationEnabled()) { LibVKXClient.getInstance().runOnService(service -> { try { service.addTrackToCache(track_id, owner_id, access_key); @@ -101,7 +101,7 @@ public class LastFMScrobbler { fetch(params, new Callback() { @Override public void a(Call call, IOException e) { - Log.d("Scrobbler", e+""); + Log.d("Scrobbler", e + ""); } @Override diff --git a/app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java b/app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java index cea2fdcb4..cd2e8cad8 100644 --- a/app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java +++ b/app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java @@ -25,9 +25,8 @@ import ru.vtosters.lite.music.cache.helpers.PlaylistHelper; import ru.vtosters.lite.music.cache.helpers.TracklistHelper; public class PlaylistInjector { - private static final ExecutorService executor = Executors.newCachedThreadPool(); - public final static String CHANNEL_NAME = "VTCH"; + private static final ExecutorService executor = Executors.newCachedThreadPool(); public static void injectDownloadPlaylist(Playlist playlist) { executor.submit(() -> AudioDownloader.cachePlaylist(playlist)); diff --git a/app/src/main/java/ru/vtosters/lite/proxy/GithubList.java b/app/src/main/java/ru/vtosters/lite/proxy/GithubList.java index a8e3f6eda..3f7b21032 100644 --- a/app/src/main/java/ru/vtosters/lite/proxy/GithubList.java +++ b/app/src/main/java/ru/vtosters/lite/proxy/GithubList.java @@ -29,7 +29,7 @@ public class GithubList { Log.d(proxyname, response); return new ArrayList<>(Arrays.asList(response.split("\n"))); - } catch (Exception e){ + } catch (Exception e) { Log.d(proxyname, "Failed to fetch data, link: " + link); return null; diff --git a/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java b/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java index f0050d2c7..5cfff5554 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java +++ b/app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java @@ -97,8 +97,8 @@ public class ImagineArrayAdapter extends ArrayAdapter edit().putBoolean("showAlert", false).apply() ) .setNeutralButton(R.string.startbtn1, - (dialogInterface, i) -> { - edit().putBoolean("showAlert", false).apply(); - activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters"))); - } + (dialogInterface, i) -> { + edit().putBoolean("showAlert", false).apply(); + activity.startActivity(new Intent("android.intent.action.VIEW").setData(Uri.parse("https://t.me/vtosters"))); + } ) .show(); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index 16557a602..1f52431d1 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -132,6 +132,11 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment { return super.onPreferenceTreeClick(preference); } + @Override + public int T4() { + return R.string.vtlfeed; + } + public class openofficialsett implements Preference.OnPreferenceClickListener { @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference) { @@ -142,9 +147,4 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment { return true; } } - - @Override - public int T4() { - return R.string.vtlfeed; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java index 28472aa71..d0421fb5b 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java @@ -54,15 +54,15 @@ public class InterfaceFragment extends MaterialPreferenceToolbarFragment { return true; } + @Override + public int T4() { + return R.string.vtlinterface; + } + public class restart implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { return InterfaceFragment.this.restart(preference); } } - - @Override - public int T4() { - return R.string.vtlinterface; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java index 1f94397d7..7fbbc1236 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java @@ -276,6 +276,11 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment { .show(); } + @Override + public int T4() { + return R.string.vtlmedia; + } + private static class restart implements Preference.OnPreferenceChangeListener { @Override public boolean onPreferenceChange(Preference preference, Object o) { @@ -292,9 +297,4 @@ public class MediaFragment extends MaterialPreferenceToolbarFragment { return true; } } - - @Override - public int T4() { - return R.string.vtlmedia; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java index 2cd0440a6..18d235216 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java @@ -88,6 +88,11 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { return true; } + @Override + public int T4() { + return R.string.vtlmessages; + } + public class restart implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { @@ -122,9 +127,4 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment { return true; } } - - @Override - public int T4() { - return R.string.vtlmessages; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java index 524421bdc..fe5feb92a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java @@ -65,6 +65,7 @@ import ru.vtosters.lite.utils.ContactsUtils; public class OtherFragment extends MaterialPreferenceToolbarFragment { private static final int VK_ADMIN_TOKEN_REQUEST_CODE = 1; + @Override public void onCreate(Bundle bundle) { super.onCreate(bundle); @@ -187,7 +188,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { .setNegativeButton(requireContext().getString(R.string.cancel), null) .setView(rg) .setPositiveButton(requireContext().getString(R.string.save), (dialog, which) -> { - var sizes = new String[] { "Default", "100mb", "500mb", "1gb", "2gb", "5gb" }; + var sizes = new String[]{"Default", "100mb", "500mb", "1gb", "2gb", "5gb"}; var id = rg.getCheckedRadioButtonId(); getDefaultPrefs().edit() .putInt("autoclearcache_size", id) @@ -251,7 +252,7 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { private void delprefs(Context context) { new VkAlertDialog.Builder(context) - .setTitle(requireContext().getString(R.string.warning)) + .setTitle(requireContext().getString(R.string.warning)) .setMessage(requireContext().getString(R.string.settings_reset_confirm)) .setCancelable(false) .setPositiveButton(requireContext().getString(R.string.yes), (dialogInterface, i) -> { @@ -262,6 +263,11 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { .show(); } + @Override + public int T4() { + return R.string.vtlother; + } + public static class d implements Preference.OnPreferenceClickListener { @Override // android.support.v7.preference.Preference.c public boolean onPreferenceClick(Preference preference) { @@ -368,9 +374,4 @@ public class OtherFragment extends MaterialPreferenceToolbarFragment { return true; } } - - @Override - public int T4() { - return R.string.vtlother; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java index c60b3352c..d9e243c7a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java @@ -129,7 +129,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment { addPreferenceCategory(this, "OEM Information"); - if (isOneUi){ + if (isOneUi) { addPreference(this, "", "OneUiMajorVersion", oneUiMajorVersion, 0, preference -> { ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", oneUiMajorVersion)); sendToast(requireContext().getString(R.string.copied_to_clipboard)); @@ -161,7 +161,7 @@ public class SystemInfo extends MaterialPreferenceToolbarFragment { return false; }); } - } else if (isEMUI){ + } else if (isEMUI) { addPreference(this, "", "emuiVersionCode", emuiVersionCode, 0, preference -> { ((ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("MBH-ST", emuiVersionCode)); sendToast(requireContext().getString(R.string.copied_to_clipboard)); diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java index 6004f97dd..fbc0ffa5e 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java @@ -42,6 +42,11 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { } } + @Override + public int T4() { + return R.string.vtlthemes; + } + public static class restart implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { @@ -78,9 +83,4 @@ public class ThemesFragment extends MaterialPreferenceToolbarFragment { return true; } } - - @Override - public int T4() { - return R.string.vtlthemes; - } } diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java index 65bd711d6..9c6b7cb05 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java @@ -199,7 +199,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { requireContext().getString(R.string.appearance_theme_use_system), R.drawable.ic_palette_outline_28, getThemesumm(), AndroidUtils.getArray("theme_type_name_checkbox"), - new String[] { "system", "dark", "light" }, + new String[]{"system", "dark", "light"}, (preference, o) -> { String value = (String) o; if (!value.equals("system")) { @@ -393,7 +393,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { return false; }); - if(!vkme()){ + if (!vkme()) { if (!isTablet()) { addPreference(this, "", requireContext().getString(R.string.dockbar_editor), docksumm, R.drawable.ic_list_outline_28, preference -> { Context context = requireContext(); @@ -414,7 +414,7 @@ public class VTSettings extends MaterialPreferenceToolbarFragment { } } } - + addPreference(this, "", requireContext().getString(R.string.vtlactivity), activitysumm, R.drawable.ic_write_outline_28_new_accent, preference -> { Context context = requireContext(); Intent a2 = new Navigator(ActivityFragment.class).b(context); diff --git a/app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java b/app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java index b2525e577..7589ad678 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java @@ -54,7 +54,7 @@ public class ProfileHider { z2.set(extendedUserProfile, response); } } catch (IOException | JSONException | NoSuchFieldException | - IllegalAccessException e) { + IllegalAccessException e) { e.printStackTrace(); } catch (NullPointerException e) { Log.e("ProfileHide", "null \"profiles\" node\n" + e); diff --git a/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java b/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java index 089d6a08e..6c064fe1e 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java +++ b/app/src/main/java/ru/vtosters/lite/utils/RenameTool.java @@ -180,41 +180,41 @@ public class RenameTool { .setMessage(R.string.rename_message) .setView(linearLayout) .setPositiveButton("OK", (dialog, which) -> { - String firstName = fn.getText().toString(); - String lastName = ln.getText().toString(); - SQLiteDatabase writableDatabase = getHelper().getWritableDatabase(); - try { - if (isChangedName(id)) { - writableDatabase.execSQL( - String.format("UPDATE %s SET %s='%s', %s='%s' WHERE %s='%s'", - TABLE_NAME, - COLUMN_FIRSTNAME, URLEncoder.encode(firstName, "UTF-8"), - COLUMN_LASTNAME, URLEncoder.encode(lastName, "UTF-8"), - COLUMN_VKID, id)); - } else { - writableDatabase.execSQL( - String.format("INSERT INTO %s (%s, %s, %s) VALUES (%s, '%s', '%s')", - TABLE_NAME, - COLUMN_VKID, COLUMN_FIRSTNAME, COLUMN_LASTNAME, - id, URLEncoder.encode(firstName, "UTF-8"), URLEncoder.encode(lastName, "UTF-8"))); - } - updateRequested = true; - if (id == AccountManagerUtils.getUserId()) { - ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED")); - } - ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id)); + String firstName = fn.getText().toString(); + String lastName = ln.getText().toString(); + SQLiteDatabase writableDatabase = getHelper().getWritableDatabase(); + try { + if (isChangedName(id)) { + writableDatabase.execSQL( + String.format("UPDATE %s SET %s='%s', %s='%s' WHERE %s='%s'", + TABLE_NAME, + COLUMN_FIRSTNAME, URLEncoder.encode(firstName, "UTF-8"), + COLUMN_LASTNAME, URLEncoder.encode(lastName, "UTF-8"), + COLUMN_VKID, id)); + } else { + writableDatabase.execSQL( + String.format("INSERT INTO %s (%s, %s, %s) VALUES (%s, '%s', '%s')", + TABLE_NAME, + COLUMN_VKID, COLUMN_FIRSTNAME, COLUMN_LASTNAME, + id, URLEncoder.encode(firstName, "UTF-8"), URLEncoder.encode(lastName, "UTF-8"))); + } + updateRequested = true; + if (id == AccountManagerUtils.getUserId()) { + ctx.sendBroadcast(new Intent("com.vkontakte.android.USER_NAME_CHANGED")); + } + ctx.sendBroadcast(new Intent("com.vkontakte.android.ACTION_PROFILE_UPDATED").putExtra("uid", id)); - sendToast(ctx.getString(R.string.rename_success)); - } catch (Exception e) { - e.printStackTrace(); - sendToast(ctx.getString(R.string.rename_error)); - } + sendToast(ctx.getString(R.string.rename_success)); + } catch (Exception e) { + e.printStackTrace(); + sendToast(ctx.getString(R.string.rename_error)); + } }); if (isChangedName(id)) builder.setNeutralButton(R.string.rename_reset, (dialog, which) -> { getHelper().getWritableDatabase().execSQL( String.format( - "DELETE FROM %s WHERE %s='%s'", + "DELETE FROM %s WHERE %s='%s'", TABLE_NAME, COLUMN_VKID, id)); if (id == AccountManagerUtils.getUserId()) { @@ -261,17 +261,17 @@ public class RenameTool { if (isChangedNameGroup(id)) { writableDatabase.execSQL( String.format( - "UPDATE %s SET %s='%s' WHERE %s='%s'", - TABLE_NAME_GROUP, - COLUMN_NAME, URLEncoder.encode(firstName, "UTF-8"), - COLUMN_VKID, id)); + "UPDATE %s SET %s='%s' WHERE %s='%s'", + TABLE_NAME_GROUP, + COLUMN_NAME, URLEncoder.encode(firstName, "UTF-8"), + COLUMN_VKID, id)); } else { writableDatabase.execSQL( String.format( - "INSERT INTO %s (%s, %s) VALUES (%s, '%s')", - TABLE_NAME_GROUP, - COLUMN_VKID, COLUMN_NAME, - id, URLEncoder.encode(firstName, "UTF-8"))); + "INSERT INTO %s (%s, %s) VALUES (%s, '%s')", + TABLE_NAME_GROUP, + COLUMN_VKID, COLUMN_NAME, + id, URLEncoder.encode(firstName, "UTF-8"))); } updateRequested = true; sendToast(AndroidUtils.getString(R.string.rename_group_success)); 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 b79a8202f..ea51fb091 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java +++ b/app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java @@ -61,14 +61,14 @@ public class ThemesUtils { } } // Apply VKTheme and ImTheme (hard applying without dynamic theme changing) - public static void setSystemModeTheme(int theme) { - AppCompatDelegate.setDefaultNightMode(theme); - } - public static int getSystemModeTheme() { return AppCompatDelegate.getDefaultNightMode(); } + public static void setSystemModeTheme(int theme) { + AppCompatDelegate.setDefaultNightMode(theme); + } + public static void setTheme(VKTheme theme, Activity activity) { if (activity == null) { activity = getCurrentActivity();