run some formatters

Signed-off-by: Mark Pashmfouroush <[email protected]>
Salartoken · Feb 21, 2024 · ef51c6a · ef51c6a
1 parent 44384e1
commit ef51c6a
Show file tree

Hide file tree

Showing 45 changed files with 1,360 additions and 1,391 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+  xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission
-        android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"
-        android:minSdkVersion="34" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
-    <application
-        android:allowBackup="true"
-        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="false"
-        tools:replace="android:supportsRtl"
-        android:screenOrientation="portrait"
-        android:theme="@style/Theme.OblivionUI"
-        tools:targetApi="31">
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission
+    android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"
+    android:minSdkVersion="34" />
+  <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+  <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+  <application
+    android:allowBackup="true"
+    android:dataExtractionRules="@xml/data_extraction_rules"
+    android:fullBackupContent="@xml/backup_rules"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:supportsRtl="false"
+    tools:replace="android:supportsRtl"
+    android:screenOrientation="portrait"
+    android:theme="@style/Theme.OblivionUI"
+    tools:targetApi="31">
 
-        <service
-            android:name=".OblivionVpnService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="systemExempted"
-            android:process=":vpn_background">
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
+    <service
+      android:name=".OblivionVpnService"
+      android:enabled="true"
+      android:exported="false"
+      android:permission="android.permission.BIND_VPN_SERVICE"
+      android:foregroundServiceType="systemExempted"
+      android:process=":vpn_background">
+      <intent-filter>
+        <action android:name="android.net.VpnService" />
+      </intent-filter>
 
-            <meta-data
-                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-                android:value="true" />
-        </service>
+      <meta-data
+        android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+        android:value="true" />
+    </service>
 
-        <service
-            android:name=".QuickStartService"
-            android:exported="true"
-            android:label="Oblivion"
-            android:icon="@drawable/vpn_off"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
+    <service
+      android:name=".QuickStartService"
+      android:exported="true"
+      android:label="Oblivion"
+      android:icon="@drawable/vpn_off"
+      android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+      <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+        android:value="true" />
+      <intent-filter>
+        <action android:name="android.service.quicksettings.action.QS_TILE" />
+      </intent-filter>
 
     </service>
 
-        <activity
-            android:name="org.bepass.oblivion.MainActivity"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.OblivionUI">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+    <activity
+      android:name="org.bepass.oblivion.MainActivity"
+      android:exported="true"
+      android:label="@string/app_name"
+      android:theme="@style/Theme.OblivionUI">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
 
-        <activity
-            android:name="org.bepass.oblivion.InfoActivity"
-            android:exported="false" />
+    <activity
+      android:name="org.bepass.oblivion.InfoActivity"
+      android:exported="false" />
 
-        <activity
-            android:name="org.bepass.oblivion.BugActivity"
-            android:exported="false" />
+    <activity
+      android:name="org.bepass.oblivion.BugActivity"
+      android:exported="false" />
 
-        <activity
-            android:name="org.bepass.oblivion.SettingsActivity"
-            android:exported="false"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+    <activity
+      android:name="org.bepass.oblivion.SettingsActivity"
+      android:exported="false"
+      android:windowSoftInputMode="stateAlwaysHidden" />
 
-    </application>
+  </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/org/bepass/oblivion/BugActivity.java b/app/src/main/java/org/bepass/oblivion/BugActivity.java
@@ -1,26 +1,26 @@
 package org.bepass.oblivion;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.widget.ImageView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
 public class BugActivity extends AppCompatActivity {
 
+    private final Handler handler = new Handler(Looper.getMainLooper());
     private ImageView back;
     private TextView logs;
     private ScrollView logScrollView;
     private boolean isUserScrollingUp = false;
-    private Handler handler = new Handler(Looper.getMainLooper());
     private Runnable logUpdater;
 
     @Override
@@ -86,4 +86,4 @@ private void readLogsFromFile() {
             }
         }).start();
     }
-}
+}
diff --git a/app/src/main/java/org/bepass/oblivion/ConnectionState.java b/app/src/main/java/org/bepass/oblivion/ConnectionState.java
@@ -1,7 +1,5 @@
 package org.bepass.oblivion;
 
 public enum ConnectionState {
-    CONNECTING,
-    CONNECTED,
-    DISCONNECTED
+    CONNECTING, CONNECTED, DISCONNECTED
 }
diff --git a/app/src/main/java/org/bepass/oblivion/EditSheet.java b/app/src/main/java/org/bepass/oblivion/EditSheet.java
@@ -6,7 +6,6 @@
 import android.widget.TextView;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
-import org.bepass.oblivion.R;
 
 public class EditSheet {
 

diff --git a/app/src/main/java/org/bepass/oblivion/FileManager.java b/app/src/main/java/org/bepass/oblivion/FileManager.java
@@ -2,13 +2,11 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.Log;
 
 public class FileManager {
-    private static FileManager instance;
-    private SharedPreferences sharedPreferences;
-
     public static String currentLog;
+    private static FileManager instance;
+    private final SharedPreferences sharedPreferences;
 
     // Private constructor for singleton pattern
     private FileManager(Context context) {
@@ -60,6 +58,7 @@ public String getString(String name, String defaultValue) {
     public boolean getBoolean(String name) {
         return sharedPreferences.getBoolean(name, false);
     }
+
     public boolean getBoolean(String name, boolean defaultValue) {
         return sharedPreferences.getBoolean(name, defaultValue);
     }

diff --git a/app/src/main/java/org/bepass/oblivion/InfoActivity.java b/app/src/main/java/org/bepass/oblivion/InfoActivity.java
@@ -1,14 +1,12 @@
 package org.bepass.oblivion;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import org.bepass.oblivion.R;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class InfoActivity extends AppCompatActivity {
 
@@ -37,4 +35,4 @@ protected void openURL(String url) {
         Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         startActivity(intent);
     }
-}
+}
diff --git a/app/src/main/java/org/bepass/oblivion/MainActivity.java b/app/src/main/java/org/bepass/oblivion/MainActivity.java
@@ -23,25 +23,19 @@
 public class MainActivity extends AppCompatActivity {
 
     private static final String ConnectionStateObserverKey = "mainActivity";
-    private ActivityResultLauncher<String> pushNotificationPermissionLauncher;
-    private ActivityResultLauncher<Intent> vpnPermissionLauncher;
-
-    private Messenger serviceMessenger;
-    private boolean isBound;
-
-
     // Views
     ImageView infoIcon, bugIcon, settingsIcon;
     TouchAwareSwitch switchButton;
     TextView stateText;
-
     FileManager fileManager;
-
     Boolean canShowNotification = false;
-
+    private ActivityResultLauncher<String> pushNotificationPermissionLauncher;
+    private ActivityResultLauncher<Intent> vpnPermissionLauncher;
+    private Messenger serviceMessenger;
+    private boolean isBound;
     private ConnectionState lastKnownConnectionState = ConnectionState.DISCONNECTED;
 
-    private ServiceConnection connection = new ServiceConnection() {
+    private final ServiceConnection connection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName className, IBinder service) {
             serviceMessenger = new Messenger(service);
@@ -59,7 +53,7 @@ public void onServiceDisconnected(ComponentName arg0) {
 
     private SwitchButton.OnCheckedChangeListener createSwitchCheckedChangeListener() {
         return (view, isChecked) -> {
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !canShowNotification) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && !canShowNotification) {
                 pushNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
                 return;
             }
@@ -72,7 +66,7 @@ private SwitchButton.OnCheckedChangeListener createSwitchCheckedChangeListener()
                 } else {
                     startVpnService();
                 }
-            } else if(lastKnownConnectionState == ConnectionState.CONNECTED || lastKnownConnectionState == ConnectionState.CONNECTING) {
+            } else if (lastKnownConnectionState == ConnectionState.CONNECTED || lastKnownConnectionState == ConnectionState.CONNECTING) {
                 stopVpnService();
             }
         };
@@ -88,7 +82,6 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
 
-
     private void observeConnectionStatus() {
         if (!isBound) return;
         OblivionVpnService.registerConnectionStateObserver(ConnectionStateObserverKey, serviceMessenger, new ConnectionStateChangeListener() {
@@ -104,8 +97,9 @@ private void unsubscribeConnectionStatus() {
         if (!isBound) return;
         OblivionVpnService.unregisterConnectionStateObserver(ConnectionStateObserverKey, serviceMessenger);
     }
+
     private void updateUi() {
-        switch(lastKnownConnectionState) {
+        switch (lastKnownConnectionState) {
             case DISCONNECTED:
                 disconnected();
                 break;
@@ -164,28 +158,22 @@ private void firstValueInit() {
     }
 
     private void initPermissionLauncher() {
-        pushNotificationPermissionLauncher = registerForActivityResult(
-                new ActivityResultContracts.RequestPermission(),
-                isGranted -> {
-                    if (isGranted) {
-                        canShowNotification = true;
-                    } else {
-                        disconnected();
-                        Toast.makeText(this, "Permission denied", Toast.LENGTH_LONG).show();
-                    }
-                }
-        );
-        vpnPermissionLauncher = registerForActivityResult(
-                new ActivityResultContracts.StartActivityForResult(),
-                result -> {
-                    if (result.getResultCode() == RESULT_OK) {
-                        startVpnService();
-                    } else {
-                        stopVpnService();
-                        Toast.makeText(this, "Really!?", Toast.LENGTH_LONG).show();
-                    }
-                }
-        );
+        pushNotificationPermissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
+            if (isGranted) {
+                canShowNotification = true;
+            } else {
+                disconnected();
+                Toast.makeText(this, "Permission denied", Toast.LENGTH_LONG).show();
+            }
+        });
+        vpnPermissionLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (result.getResultCode() == RESULT_OK) {
+                startVpnService();
+            } else {
+                stopVpnService();
+                Toast.makeText(this, "Really!?", Toast.LENGTH_LONG).show();
+            }
+        });
     }
 
 
@@ -220,4 +208,4 @@ private void init() {
         bugIcon.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, BugActivity.class)));
         settingsIcon.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, SettingsActivity.class)));
     }
-}
+}