Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Lint code #602

Draft
wants to merge 3 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
[*]
max_line_length = off

[*.java]
ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,net.**,|,com.**,|,*

[*.{kt,kts}]
ktlint_code_style = intellij_idea
ktlint_standard_no-wildcard-imports = disabled
# ktlint entries are for ktlint gradle task and ktlint Intellij / Android Studio plugin.
# Ignore all 'property not supported' warnings, these are correct.
ktlint_code_style = android_studio
ktlint_standard_discouraged-comment-location = disabled
ktlint_standard_no-wildcard-imports = disabled
ij_kotlin_imports_layout=*
ij_kotlin_name_count_to_use_star_import = 5
ij_kotlin_name_count_to_use_star_import_for_members = 5
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_allow_trailing_comma = false
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@

import android.app.PendingIntent;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkRequest;
import android.net.*;
import android.os.Build;
import android.os.Handler;

import androidx.annotation.RequiresApi;

public class SpoofWifiPatch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.media.AudioAttributes;
import android.os.Build;

import androidx.annotation.RequiresApi;

public final class RemoveScreencaptureRestrictionPatch {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package app.revanced.integrations.reddit.patches;

import com.reddit.domain.model.ILink;

import java.util.ArrayList;
import java.util.List;

import com.reddit.domain.model.ILink;

public final class FilterPromotedLinksPatch {
/**
* Filters list from promoted links.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package app.revanced.integrations.shared;

import static app.revanced.integrations.shared.StringRef.str;

import java.net.MalformedURLException;
import java.net.URL;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.SearchManager;
Expand All @@ -11,11 +16,6 @@
import android.os.PowerManager;
import androidx.annotation.RequiresApi;

import java.net.MalformedURLException;
import java.net.URL;

import static app.revanced.integrations.shared.StringRef.str;

/**
* @noinspection unused
*/
Expand Down
12 changes: 4 additions & 8 deletions app/src/main/java/app/revanced/integrations/shared/Logger.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package app.revanced.integrations.shared;

import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG;
import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_STACKTRACE;
import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_TOAST_ON_ERROR;

import android.util.Log;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import static app.revanced.integrations.shared.settings.BaseSettings.*;

import java.io.PrintWriter;
import java.io.StringWriter;

import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.settings.BaseSettings;

public class Logger {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package app.revanced.integrations.shared;

import android.content.Context;
import android.content.res.Resources;

import androidx.annotation.NonNull;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import android.content.Context;
import android.content.res.Resources;
import androidx.annotation.NonNull;

public class StringRef {
private static Resources resources;
private static String packageName;
Expand Down
23 changes: 8 additions & 15 deletions app/src/main/java/app/revanced/integrations/shared/Utils.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package app.revanced.integrations.shared;

import java.text.Bidi;
import java.util.Locale;
import java.util.Objects;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.*;

import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
Expand All @@ -17,23 +24,9 @@
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.Toast;
import android.widget.Toolbar;

import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import java.text.Bidi;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;

import app.revanced.integrations.shared.settings.BooleanSetting;
import kotlin.text.Regex;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package app.revanced.integrations.shared.settings;

import static app.revanced.integrations.shared.settings.Setting.parent;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static app.revanced.integrations.shared.settings.Setting.parent;

/**
* Settings shared across multiple apps.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

@SuppressWarnings("unused")
public class BooleanSetting extends Setting<Boolean> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;
import java.util.Locale;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Locale;
import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.revanced.integrations.shared.Logger;

/**
* If an Enum value is removed or changed, any saved or imported data using the
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

@SuppressWarnings("unused")
public class FloatSetting extends Setting<Float> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

@SuppressWarnings("unused")
public class IntegerSetting extends Setting<Integer> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

@SuppressWarnings("unused")
public class LongSetting extends Setting<Long> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
package app.revanced.integrations.shared.settings;

import static app.revanced.integrations.shared.StringRef.str;

import java.util.*;

import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;

import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand All @@ -8,13 +16,6 @@
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.preference.SharedPrefCategory;
import app.revanced.integrations.youtube.sponsorblock.SponsorBlockSettings;
import org.jetbrains.annotations.NotNull;
import org.json.JSONException;
import org.json.JSONObject;

import java.util.*;

import static app.revanced.integrations.shared.StringRef.str;

@SuppressWarnings("unused")
public abstract class Setting<T> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package app.revanced.integrations.shared.settings;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.Objects;

import org.json.JSONException;
import org.json.JSONObject;

import java.util.Objects;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

@SuppressWarnings("unused")
public class StringSetting extends Setting<String> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;

import static app.revanced.integrations.shared.StringRef.str;

import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.Context;
Expand All @@ -8,14 +10,11 @@
import android.preference.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;
import app.revanced.integrations.shared.settings.BooleanSetting;
import app.revanced.integrations.shared.settings.Setting;

import static app.revanced.integrations.shared.StringRef.str;

/**
*
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;

import static app.revanced.integrations.shared.StringRef.str;

import android.app.AlertDialog;
import android.content.Context;
import android.os.Build;
Expand All @@ -9,11 +11,9 @@
import android.util.AttributeSet;
import android.util.TypedValue;
import android.widget.EditText;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;

import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.settings.Setting;

/** @noinspection deprecation, unused */
public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package app.revanced.integrations.shared.settings.preference;

import static app.revanced.integrations.shared.StringRef.str;

import java.util.Objects;

import android.app.AlertDialog;
import android.content.Context;
import android.os.Bundle;
import android.preference.EditTextPreference;
import android.util.AttributeSet;
import android.widget.Button;
import android.widget.EditText;
import app.revanced.integrations.shared.settings.Setting;
import app.revanced.integrations.shared.Logger;

import java.util.Objects;

import static app.revanced.integrations.shared.StringRef.str;
import app.revanced.integrations.shared.settings.Setting;

@SuppressWarnings("unused")
public class ResettableEditTextPreference extends EditTextPreference {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package app.revanced.integrations.shared.settings.preference;

import java.util.Objects;

import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceFragment;
Expand All @@ -8,8 +10,6 @@
import app.revanced.integrations.shared.Logger;
import app.revanced.integrations.shared.Utils;

import java.util.Objects;

/**
* Shared categories, and helper methods.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package app.revanced.integrations.syncforreddit;

import android.os.StrictMode;
import app.revanced.integrations.shared.Logger;

import java.net.HttpURLConnection;
import java.net.URL;

import android.os.StrictMode;
import app.revanced.integrations.shared.Logger;

public final class FixSLinksPatch {
public static String resolveSLink(String link) {
if (link.matches(".*reddit\\.com/r/[^/]+/s/[^/]+")) {
Expand Down
Loading
Loading