y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run auto code reformat

Browse Source
This commit is contained in:
aliveoutside
2022-11-02 16:10:56 +03:00
parent ab16fdcecb
commit 2175800f33
26 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/vtosters/lite/concurrent/VTExecutors.java
+5 -4
View File
@@ -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();
}
}
}
app/src/main/java/ru/vtosters/lite/deviceinfo/OEMDetector.java
+2 -2
View File
@@ -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() {
app/src/main/java/ru/vtosters/lite/di/singleton/VtOkHttpClient.java
+4 -4
View File
@@ -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();
}
}
app/src/main/java/ru/vtosters/lite/downloaders/MessagesDownloader.java
+4 -4
View File
@@ -329,10 +329,10 @@ public class MessagesDownloader {
"\n" +
"";
return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>"
+ AndroidUtils.getString(R.string.chat_export_title)
+ "</title><style>"
+ style
return "<html><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta charset=\"utf-8\"><title>"
+ AndroidUtils.getString(R.string.chat_export_title)
+ "</title><style>"
+ style
+ "</style></head><body>";
}
app/src/main/java/ru/vtosters/lite/encryption/EncryptProvider.java
+1 -1
View File
@@ -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);
}
}
app/src/main/java/ru/vtosters/lite/hooks/DockBarInjector.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class DockBarInjector {
}
} catch (NoSuchFieldException | IllegalAccessException | ClassNotFoundException |
NoSuchMethodException | InvocationTargetException e) {
NoSuchMethodException | InvocationTargetException e) {
e.printStackTrace();
}
app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
-1
View File
@@ -232,7 +232,6 @@ public class JsonInjectors {
}
public static JSONObject setOnlineInfo(JSONObject json) throws JSONException {
var id = json.optInt("id");
if (id == AccountManagerUtils.getUserId()) {
app/src/main/java/ru/vtosters/lite/hooks/PromoStickersHook.java
+1 -1
View File
@@ -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";
}
}
app/src/main/java/ru/vtosters/lite/hooks/ProxyHook.java
+9 -9
View File
@@ -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();
}
}
app/src/main/java/ru/vtosters/lite/hooks/WritebarHook.java
+1 -1
View File
@@ -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) {
app/src/main/java/ru/vtosters/lite/music/LastFMScrobbler.java
+2 -2
View File
@@ -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
app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java
Vendored
+1 -2
View File
@@ -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));
app/src/main/java/ru/vtosters/lite/proxy/GithubList.java
+1 -1
View File
@@ -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;
app/src/main/java/ru/vtosters/lite/ui/adapters/ImagineArrayAdapter.java
+2 -2
View File
@@ -97,8 +97,8 @@ public class ImagineArrayAdapter extends ArrayAdapter<ImagineArrayAdapter.Imagin
.inflate(R.layout.select_dialog_singlechoice_material, parent, false);
// for amoled
var tintList = new ColorStateList(
new int[][] { new int[] { android.R.attr.state_checked }, new int[] { -android.R.attr.state_checked }},
new int[] { ThemesUtils.getAccentColor(), ThemesUtils.getSTextAttr() });
new int[][]{new int[]{android.R.attr.state_checked}, new int[]{-android.R.attr.state_checked}},
new int[]{ThemesUtils.getAccentColor(), ThemesUtils.getSTextAttr()});
TextViewCompat.setCompoundDrawableTintList(checkedTextView, tintList);
checkedTextView.setChecked(position == mSelectedIndex);
container.addView(checkedTextView, LayoutUtils.createLinear(AndroidUtils.dp2px(50.0f), -2));
app/src/main/java/ru/vtosters/lite/ui/dialogs/Start.java
+4 -4
View File
@@ -28,10 +28,10 @@ public class Start {
(dialogInterface, i) -> 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();
app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java
+5 -5
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/InterfaceFragment.java
+5 -5
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MediaFragment.java
+5 -5
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/MessagesFragment.java
+5 -5
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/OtherFragment.java
+8 -7
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/SystemInfo.java
+2 -2
View File
@@ -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));
app/src/main/java/ru/vtosters/lite/ui/fragments/ThemesFragment.java
+5 -5
View File
@@ -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;
}
}
app/src/main/java/ru/vtosters/lite/ui/fragments/VTSettings.java
+3 -3
View File
@@ -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);
app/src/main/java/ru/vtosters/lite/utils/ProfileHider.java
+1 -1
View File
@@ -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);
app/src/main/java/ru/vtosters/lite/utils/RenameTool.java
+37 -37
View File
@@ -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));
app/src/main/java/ru/vtosters/lite/utils/ThemesUtils.java
+4 -4
View File
@@ -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();