From 456a74db05d5662ff8c2623570809f782329f217 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 28 Mar 2020 23:19:02 -0600 Subject: global: hardcode tags so that minification doesn't ruin the log Signed-off-by: Jason A. Donenfeld --- tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java | 2 +- tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java | 2 +- tunnel/src/main/java/com/wireguard/android/util/RootShell.java | 2 +- .../src/main/java/com/wireguard/android/util/SharedLibraryLoader.java | 2 +- tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java | 2 +- ui/src/main/java/com/wireguard/android/Application.kt | 2 +- ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt | 2 +- ui/src/main/java/com/wireguard/android/QuickTileService.kt | 2 +- ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt | 2 +- ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt | 2 +- ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt | 2 +- ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt | 2 +- ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt | 2 +- .../main/java/com/wireguard/android/preference/ZipExporterPreference.kt | 2 +- ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java index 978b39aa..34008f45 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java @@ -35,7 +35,7 @@ import androidx.collection.ArraySet; @NonNullForAll public final class GoBackend implements Backend { - private static final String TAG = "WireGuard/" + GoBackend.class.getSimpleName(); + private static final String TAG = "WireGuard/GoBackend"; @Nullable private static AlwaysOnCallback alwaysOnCallback; private static GhettoCompletableFuture vpnService = new GhettoCompletableFuture<>(); private final Context context; diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java index 78d7d5b6..d4d1f152 100644 --- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java +++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java @@ -41,7 +41,7 @@ import java9.util.stream.Stream; @NonNullForAll public final class WgQuickBackend implements Backend { - private static final String TAG = "WireGuard/" + WgQuickBackend.class.getSimpleName(); + private static final String TAG = "WireGuard/WgQuickBackend"; private final File localTemporaryDir; private final RootShell rootShell; private final Map runningConfigs = new HashMap<>(); diff --git a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java index 160ba12f..9c175552 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/RootShell.java +++ b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java @@ -29,7 +29,7 @@ import androidx.annotation.Nullable; @NonNullForAll public class RootShell { private static final String SU = "su"; - private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName(); + private static final String TAG = "WireGuard/RootShell"; private final File localBinaryDir; private final File localTemporaryDir; diff --git a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java index 1bb3659f..6b2c6142 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java +++ b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java @@ -27,7 +27,7 @@ import androidx.annotation.RestrictTo.Scope; @NonNullForAll @RestrictTo(Scope.LIBRARY_GROUP) public final class SharedLibraryLoader { - private static final String TAG = "WireGuard/" + SharedLibraryLoader.class.getSimpleName(); + private static final String TAG = "WireGuard/SharedLibraryLoader"; private SharedLibraryLoader() { } diff --git a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java index 86792cb7..81e9ebeb 100644 --- a/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java +++ b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java @@ -39,7 +39,7 @@ public final class ToolsInstaller { new File("/system/bin"), }; @Nullable private static final File INSTALL_DIR = getInstallDir(); - private static final String TAG = "WireGuard/" + ToolsInstaller.class.getSimpleName(); + private static final String TAG = "WireGuard/ToolsInstaller"; private final Context context; private final File localBinaryDir; diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt index f89a6a70..d533028f 100644 --- a/ui/src/main/java/com/wireguard/android/Application.kt +++ b/ui/src/main/java/com/wireguard/android/Application.kt @@ -88,7 +88,7 @@ class Application : android.app.Application(), OnSharedPreferenceChangeListener companion object { val USER_AGENT = String.format(Locale.ENGLISH, "WireGuard/%s (Android %d; %s; %s; %s %s; %s)", BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT, if (Build.SUPPORTED_ABIS.isNotEmpty()) Build.SUPPORTED_ABIS[0] else "unknown ABI", Build.BOARD, Build.MANUFACTURER, Build.MODEL, Build.FINGERPRINT) - private val TAG = "WireGuard/${Application::class.simpleName}" + private const val TAG = "WireGuard/Application" private lateinit var weakSelf: WeakReference @JvmStatic diff --git a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt index 5621dc83..41aff76d 100644 --- a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt +++ b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt @@ -29,6 +29,6 @@ class BootShutdownReceiver : BroadcastReceiver() { } companion object { - private val TAG = "WireGuard/${BootShutdownReceiver::class.simpleName}" + private const val TAG = "WireGuard/BootShutdownReceiver" } } diff --git a/ui/src/main/java/com/wireguard/android/QuickTileService.kt b/ui/src/main/java/com/wireguard/android/QuickTileService.kt index f7e9c0e1..5099668e 100644 --- a/ui/src/main/java/com/wireguard/android/QuickTileService.kt +++ b/ui/src/main/java/com/wireguard/android/QuickTileService.kt @@ -153,6 +153,6 @@ class QuickTileService : TileService() { } companion object { - private val TAG = "WireGuard/${QuickTileService::class.simpleName}" + private const val TAG = "WireGuard/QuickTileService" } } diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt index 99ab6871..44d81c01 100644 --- a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt @@ -39,6 +39,6 @@ class TunnelToggleActivity : AppCompatActivity() { } companion object { - private val TAG = "WireGuard/${TunnelToggleActivity::class.simpleName}" + private const val TAG = "WireGuard/TunnelToggleActivity" } } diff --git a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt index ec34e389..6fe2bece 100644 --- a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt +++ b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt @@ -77,6 +77,6 @@ class FileConfigStore(private val context: Context) : ConfigStore { } companion object { - private val TAG = "WireGuard/${FileConfigStore::class.simpleName}" + private const val TAG = "WireGuard/FileConfigStore" } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt index c40103aa..82802623 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt @@ -103,6 +103,6 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener { companion object { private const val REQUEST_CODE_VPN_PERMISSION = 23491 - private val TAG = "WireGuard/${BaseFragment::class.simpleName}" + private const val TAG = "WireGuard/BaseFragment" } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt index 7e872ffa..ff5bb42b 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt @@ -229,6 +229,6 @@ class TunnelEditorFragment : BaseFragment(), AppExclusionListener { companion object { private const val KEY_LOCAL_CONFIG = "local_config" private const val KEY_ORIGINAL_NAME = "original_name" - private val TAG = "WireGuard/${TunnelEditorFragment::class.simpleName}" + private const val TAG = "WireGuard/TunnelEditorFragment" } } diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt index 66fe9944..e92dd15c 100644 --- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt +++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt @@ -397,6 +397,6 @@ class TunnelListFragment : BaseFragment() { const val REQUEST_IMPORT = 1 private const val REQUEST_TARGET_FRAGMENT = 2 private const val CHECKED_ITEMS = "CHECKED_ITEMS" - private val TAG = "WireGuard/${TunnelListFragment::class.simpleName}" + private const val TAG = "WireGuard/TunnelListFragment" } } diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt index cd671bde..d0cb02f0 100644 --- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt +++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt @@ -91,6 +91,6 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference } companion object { - private val TAG = "WireGuard/${ZipExporterPreference::class.simpleName}" + private const val TAG = "WireGuard/ZipExporterPreference" } } diff --git a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt index 0b371b73..4470134c 100644 --- a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt +++ b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt @@ -22,6 +22,6 @@ enum class ExceptionLoggers(private val priority: Int) : BiConsumer