diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java index 327ce644f..570e6a92c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java @@ -69,6 +69,7 @@ import org.mozilla.vrbrowser.utils.ConnectivityReceiver; import org.mozilla.vrbrowser.utils.LocaleUtils; import org.mozilla.vrbrowser.utils.ServoUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.io.IOException; import java.net.URISyntaxException; @@ -112,7 +113,7 @@ public void run() { static final int SwipeDelay = 1000; // milliseconds static final long RESET_CRASH_COUNT_DELAY = 5000; - static final String LOGTAG = "VRB"; + static final String LOGTAG = SystemUtils.createLogtag(VRBrowserActivity.class); HashMap mWidgets; private int mWidgetHandleIndex = 1; AudioEngine mAudioEngine; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/audio/AudioEngine.java b/app/src/common/shared/org/mozilla/vrbrowser/audio/AudioEngine.java index 5b23575c5..2f437a30c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/audio/AudioEngine.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/audio/AudioEngine.java @@ -6,6 +6,9 @@ package org.mozilla.vrbrowser.audio; import android.content.Context; + +import org.mozilla.vrbrowser.utils.SystemUtils; + import java.util.concurrent.ConcurrentHashMap; public class AudioEngine { @@ -15,7 +18,7 @@ public class AudioEngine { private float mMasterVolume = 1.0f; private static ConcurrentHashMap mEngines = new ConcurrentHashMap<>(); private boolean mEnabled; - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(AudioEngine.class); public enum SoundType { STEREO, diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java index 7e25b96d1..8bef8e632 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/Media.java @@ -3,11 +3,12 @@ import androidx.annotation.NonNull; import org.mozilla.geckoview.MediaElement; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.concurrent.CopyOnWriteArrayList; public class Media implements MediaElement.Delegate { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(Media.class); private boolean mIsFullscreen = false; private double mCurrentTime = 0.0f; private MediaElement.Metadata mMetaData; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java index 5dceb8f89..d3d8b0b27 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/PermissionDelegate.java @@ -14,6 +14,7 @@ import org.mozilla.vrbrowser.browser.engine.SessionStore; import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; import org.mozilla.vrbrowser.ui.widgets.dialogs.PermissionWidget; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +23,7 @@ public class PermissionDelegate implements GeckoSession.PermissionDelegate, Widg static final int PERMISSION_REQUEST_CODE = 1143; - static final String LOGTAG = "VRB"; + static final String LOGTAG = SystemUtils.createLogtag(PermissionDelegate.class); private Context mContext; private int mParentWidgetHandle; private WidgetManagerDelegate mWidgetManager; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java index 28af9e130..fdc4debe7 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java @@ -15,6 +15,7 @@ import org.mozilla.vrbrowser.utils.DeviceType; import org.mozilla.vrbrowser.utils.LocaleUtils; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.NonNull; @@ -26,7 +27,7 @@ public class SettingsStore { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(SettingsStore.class); private static SettingsStore mSettingsInstance; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/UserAgentOverride.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/UserAgentOverride.java index aa5de0661..db2b69388 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/UserAgentOverride.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/UserAgentOverride.java @@ -7,6 +7,7 @@ import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.io.IOException; import java.io.InputStream; @@ -19,7 +20,7 @@ import java.util.List; public class UserAgentOverride { - private final static String LOGTAG = "VRB"; + private final static String LOGTAG = SystemUtils.createLogtag(UserAgentOverride.class); private static final String NO_OVERRIDE_FOUND = "NO OVERRIDE USER AGENT FOUND"; private ArrayMap mOverrideMap; private ArrayMap mOverrideCache; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java index 638147850..843bbf0b5 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java @@ -35,6 +35,7 @@ import org.mozilla.vrbrowser.geolocation.GeolocationData; import org.mozilla.vrbrowser.telemetry.TelemetryWrapper; import org.mozilla.vrbrowser.utils.InternalPages; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.net.URI; import java.net.URISyntaxException; @@ -55,8 +56,7 @@ public class SessionStack implements ContentBlocking.Delegate, GeckoSession.Navi GeckoSession.PromptDelegate, GeckoSession.MediaDelegate, GeckoSession.HistoryDelegate, SharedPreferences.OnSharedPreferenceChangeListener { - private static final String LOGTAG = "VRB"; - + private static final String LOGTAG = SystemUtils.createLogtag(SessionStack.class); // You can test a local file using: "resource://android/assets/webvr/index.html" public static final int NO_SESSION = -1; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java b/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java index de0c71596..3f98380a3 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/CrashReporterService.java @@ -13,13 +13,14 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.VRBrowserActivity; import org.mozilla.vrbrowser.browser.SettingsStore; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.NonNull; import androidx.core.app.JobIntentService; public class CrashReporterService extends JobIntentService { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(CrashReporterService.class); public static final String CRASH_ACTION = BuildConfig.APPLICATION_ID + ".CRASH_ACTION"; public static final String DATA_TAG = "intent"; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/GlobalExceptionHandler.java b/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/GlobalExceptionHandler.java index 1842411e1..fad3d7635 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/GlobalExceptionHandler.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/crashreporting/GlobalExceptionHandler.java @@ -5,12 +5,13 @@ import android.util.Log; import org.mozilla.gecko.CrashHandler; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.NonNull; public class GlobalExceptionHandler { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(GlobalExceptionHandler.class); private static GlobalExceptionHandler mInstance; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/geolocation/GeolocationData.java b/app/src/common/shared/org/mozilla/vrbrowser/geolocation/GeolocationData.java index 12e1f71b4..aa1e96b81 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/geolocation/GeolocationData.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/geolocation/GeolocationData.java @@ -4,6 +4,7 @@ import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.NonNull; @@ -12,7 +13,7 @@ */ public class GeolocationData { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(GeolocationData.class); private JSONObject mData; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java b/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java index ff577801a..e3514f5dc 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/input/MotionEventGenerator.java @@ -12,9 +12,10 @@ import android.util.SparseArray; import org.mozilla.vrbrowser.ui.widgets.Widget; +import org.mozilla.vrbrowser.utils.SystemUtils; public class MotionEventGenerator { - static final String LOGTAG = "VRB"; + static final String LOGTAG = SystemUtils.createLogtag(MotionEventGenerator.class); static class Device { int mDevice; Widget mPreviousWidget = null; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java b/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java index e37aaf0a7..663208573 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java @@ -24,6 +24,7 @@ import org.mozilla.vrbrowser.browser.SettingsStore; import org.mozilla.vrbrowser.search.SearchEngineWrapper; import org.mozilla.vrbrowser.utils.DeviceType; +import org.mozilla.vrbrowser.utils.SystemUtils; import org.mozilla.vrbrowser.utils.UrlUtils; import java.net.URI; @@ -40,7 +41,7 @@ public class TelemetryWrapper { private final static String APP_NAME = "FirefoxReality"; - private final static String LOGTAG = TelemetryWrapper.class.getSimpleName(); + private final static String LOGTAG = SystemUtils.createLogtag(TelemetryWrapper.class); private final static int MIN_LOAD_TIME = 40; private final static int LOADING_BUCKET_SIZE_MS = 100; private final static int MIN_IMMERSIVE_TIME = 1000; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/OffscreenDisplay.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/OffscreenDisplay.java index c42efdc3e..f86193834 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/OffscreenDisplay.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/OffscreenDisplay.java @@ -17,8 +17,10 @@ import android.view.View; import android.view.ViewGroup; +import org.mozilla.vrbrowser.utils.SystemUtils; + public class OffscreenDisplay { - final String LOGTAG = "VRB"; + final String LOGTAG = SystemUtils.createLogtag(OffscreenDisplay.class); private Context mContext; private int mWidth; private int mHeight; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java index 43b828851..eca9fc0cb 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java @@ -19,6 +19,7 @@ import org.mozilla.vrbrowser.ui.callbacks.BookmarkItemCallback; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; import org.mozilla.vrbrowser.utils.AnimationHelper; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.List; import java.util.Objects; @@ -27,7 +28,7 @@ public class BookmarkAdapter extends RecyclerView.Adapter { - static final String LOGTAG = BookmarkAdapter.class.getSimpleName(); + static final String LOGTAG = SystemUtils.createLogtag(BookmarkAdapter.class); private static final int ICON_ANIMATION_DURATION = 200; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java index 50c2a5d2e..0a297c338 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java @@ -19,6 +19,7 @@ import org.mozilla.vrbrowser.ui.callbacks.HistoryItemCallback; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; import org.mozilla.vrbrowser.utils.AnimationHelper; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.List; import java.util.Objects; @@ -27,7 +28,7 @@ public class HistoryAdapter extends RecyclerView.Adapter { - static final String LOGTAG = HistoryAdapter.class.getSimpleName(); + static final String LOGTAG = SystemUtils.createLogtag(HistoryAdapter.class); private static final int ICON_ANIMATION_DURATION = 200; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java index f38f9b17f..77e2a37a4 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChinesePinyinKeyboard.java @@ -10,6 +10,7 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.input.CustomKeyboard; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Arrays; @@ -23,7 +24,7 @@ import androidx.annotation.Nullable; public class ChinesePinyinKeyboard extends BaseKeyboard { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(ChinesePinyinKeyboard.class); private CustomKeyboard mKeyboard; private DBHelper mDB; private HashMap mKeymaps = new HashMap<>(); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java index 5b9ebba95..005f2122b 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/ChineseZhuyinKeyboard.java @@ -11,6 +11,7 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.input.CustomKeyboard; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Collections; @@ -24,7 +25,7 @@ import androidx.annotation.Nullable; public class ChineseZhuyinKeyboard extends BaseKeyboard { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(ChineseZhuyinKeyboard.class); private static final String nonZhuyinReg = "[^ㄅ-ㄩ˙ˊˇˋˉ]"; private CustomKeyboard mKeyboard; private DBWordHelper mWordDB; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java index 92fe1058e..6341cfe29 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/keyboards/JapaneseKeyboard.java @@ -8,6 +8,7 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.input.CustomKeyboard; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +26,7 @@ public class JapaneseKeyboard extends BaseKeyboard { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(JapaneseKeyboard.class); private CustomKeyboard mKeyboard; private CustomKeyboard mSymbolsKeyboard; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java index 2918ea2fb..659593c7e 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java @@ -39,7 +39,7 @@ public class HistoryView extends FrameLayout implements HistoryStore.HistoryListener { - private static final String LOGTAG = HistoryView.class.getSimpleName(); + private static final String LOGTAG = SystemUtils.createLogtag(HistoryView.class); private HistoryBinding mBinding; private HistoryAdapter mHistoryAdapter; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java index 344ad2f68..0aa357bf3 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HoneycombButton.java @@ -14,12 +14,13 @@ import org.mozilla.vrbrowser.utils.DeviceType; import org.mozilla.vrbrowser.R; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.Nullable; public class HoneycombButton extends LinearLayout { - private static final String LOGTAG = "VRB"; + private static final String LOGTAG = SystemUtils.createLogtag(HoneycombButton.class); private ImageView mIcon; private TextView mText; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java index 0b9e83481..9883a4e38 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java @@ -39,6 +39,7 @@ import org.mozilla.vrbrowser.telemetry.TelemetryWrapper; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import org.mozilla.vrbrowser.utils.UIThreadExecutor; import org.mozilla.vrbrowser.utils.UrlUtils; @@ -54,7 +55,7 @@ public class NavigationURLBar extends FrameLayout { - private static final String LOGTAG = NavigationURLBar.class.getSimpleName(); + private static final String LOGTAG = SystemUtils.createLogtag(NavigationURLBar.class); private InlineAutocompleteEditText mURL; private UIButton mMicrophoneButton; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java index c25c9df6b..c104c023e 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java @@ -49,6 +49,7 @@ import org.mozilla.vrbrowser.ui.keyboards.ChinesePinyinKeyboard; import org.mozilla.vrbrowser.ui.keyboards.EnglishKeyboard; import org.mozilla.vrbrowser.utils.StringUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Locale; @@ -60,8 +61,6 @@ public class KeyboardWidget extends UIWidget implements CustomKeyboardView.OnKeyboardActionListener, AutoCompletionView.Delegate, GeckoSession.TextInputDelegate, WidgetManagerDelegate.FocusChangeListener, VoiceSearchWidget.VoiceSearchDelegate, TextWatcher { - private static final String LOGTAG = "VRB"; - private static int MAX_CHARS_PER_POPUP_LINE = 10; private CustomKeyboardView mKeyboardView; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java index 5ce2313e5..670517dd4 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/MediaControlsWidget.java @@ -20,10 +20,10 @@ import org.mozilla.vrbrowser.ui.views.MediaSeekBar; import org.mozilla.vrbrowser.ui.views.UIButton; import org.mozilla.vrbrowser.ui.views.VolumeControl; +import org.mozilla.vrbrowser.utils.SystemUtils; public class MediaControlsWidget extends UIWidget implements MediaElement.Delegate { - private static final String LOGTAG = "VRB"; private Media mMedia; private MediaSeekBar mSeekBar; private VolumeControl mVolumeControl; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java index 03b99834e..8a75fc75c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java @@ -37,6 +37,7 @@ import org.mozilla.vrbrowser.ui.widgets.dialogs.VoiceSearchWidget; import org.mozilla.vrbrowser.utils.AnimationHelper; import org.mozilla.vrbrowser.utils.ServoUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import org.mozilla.vrbrowser.utils.UIThreadExecutor; import java.util.ArrayList; @@ -50,8 +51,6 @@ public class NavigationBarWidget extends UIWidget implements GeckoSession.Naviga SharedPreferences.OnSharedPreferenceChangeListener, SuggestionsWidget.URLBarPopupDelegate, WindowWidget.BookmarksViewDelegate, WindowWidget.HistoryViewDelegate, TrayListener { - private static final String LOGTAG = NavigationBarWidget.class.getSimpleName(); - private AudioEngine mAudio; private UIButton mBackButton; private UIButton mForwardButton; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java index 7af510540..d5c6d4591 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TitleBarWidget.java @@ -20,6 +20,7 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.browser.Media; import org.mozilla.vrbrowser.databinding.TitleBarBinding; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.net.MalformedURLException; import java.net.URI; @@ -27,8 +28,6 @@ public class TitleBarWidget extends UIWidget { - private static final String LOGTAG = TitleBarWidget.class.getSimpleName(); - public interface Delegate { void onTitleClicked(@NonNull TitleBarWidget titleBar); void onMediaPlayClicked(@NonNull TitleBarWidget titleBar); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java index 475e929ae..43a4db819 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java @@ -28,6 +28,7 @@ import org.mozilla.vrbrowser.telemetry.TelemetryWrapper; import org.mozilla.vrbrowser.ui.views.UIButton; import org.mozilla.vrbrowser.ui.widgets.settings.SettingsWidget; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.util.ArrayList; import java.util.Arrays; @@ -36,8 +37,6 @@ public class TrayWidget extends UIWidget implements SessionChangeListener, WindowWidget.BookmarksViewDelegate, WindowWidget.HistoryViewDelegate, WidgetManagerDelegate.UpdateListener { - static final String LOGTAG = TrayWidget.class.getSimpleName(); - private static final int ICON_ANIMATION_DURATION = 200; private static final int LIBRARY_NOTIFICATION_DURATION = 3000; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java index b44207933..bcb71d996 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java @@ -19,6 +19,7 @@ import org.mozilla.vrbrowser.R; import org.mozilla.vrbrowser.browser.SettingsStore; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.lang.reflect.Constructor; import java.util.HashMap; @@ -28,7 +29,7 @@ public abstract class UIWidget extends FrameLayout implements Widget { - private static final String LOGTAG = "VRB"; + protected final String LOGTAG = SystemUtils.createLogtag(this.getClass()); public interface Delegate { void onDismiss(); diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java index b58ec1a16..2593850e4 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java @@ -76,8 +76,6 @@ public class WindowWidget extends UIWidget implements SessionChangeListener, GeckoSession.NavigationDelegate, VideoAvailabilityListener, GeckoSession.HistoryDelegate, GeckoSession.ProgressDelegate { - private static final String LOGTAG = WindowWidget.class.getSimpleName(); - public interface HistoryViewDelegate { default void onHistoryViewShown(WindowWidget aWindow) {} default void onHistoryViewHidden(WindowWidget aWindow) {} diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java index 2d6c96478..d18357011 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java @@ -15,6 +15,7 @@ import org.mozilla.vrbrowser.browser.SettingsStore; import org.mozilla.vrbrowser.browser.engine.SessionStack; import org.mozilla.vrbrowser.telemetry.TelemetryWrapper; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.io.File; import java.io.FileReader; @@ -28,7 +29,7 @@ public class Windows implements TrayListener, TopBarWidget.Delegate, TitleBarWidget.Delegate, GeckoSession.ContentDelegate, WindowWidget.WindowDelegate { - private static final String LOGTAG = Windows.class.getSimpleName(); + private static final String LOGTAG = SystemUtils.createLogtag(Windows.class); private static final String WINDOWS_SAVE_FILENAME = "windows_state.json"; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/CrashDialogWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/CrashDialogWidget.java index abbba8a29..6fdf00eb5 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/CrashDialogWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/CrashDialogWidget.java @@ -17,11 +17,10 @@ import org.mozilla.vrbrowser.browser.SettingsStore; import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; +import org.mozilla.vrbrowser.utils.SystemUtils; public class CrashDialogWidget extends UIDialog { - private static final String LOGTAG = "VRB"; - public interface CrashDialogDelegate { void onSendData(); } diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/PermissionWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/PermissionWidget.java index f82c1cacb..e5e14b9be 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/PermissionWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/PermissionWidget.java @@ -20,13 +20,12 @@ import org.mozilla.vrbrowser.ui.widgets.UIWidget; import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.net.URI; public class PermissionWidget extends UIDialog implements WidgetManagerDelegate.FocusChangeListener { - private static final String LOGTAG = "VRB"; - private TextView mPermissionMessage; private ImageView mPermissionIcon; private GeckoSession.PermissionDelegate.Callback mPermissionCallback; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/RestartDialogWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/RestartDialogWidget.java index 0fe3d7dbd..9f4a2572a 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/RestartDialogWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/RestartDialogWidget.java @@ -18,8 +18,6 @@ public class RestartDialogWidget extends UIDialog { - private static final String LOGTAG = "VRB"; - private AudioEngine mAudio; public RestartDialogWidget(Context aContext) { diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java index 92cf11c82..1c30da62f 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/VoiceSearchWidget.java @@ -33,6 +33,7 @@ import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate; import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement; import org.mozilla.vrbrowser.utils.LocaleUtils; +import org.mozilla.vrbrowser.utils.SystemUtils; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; @@ -40,7 +41,6 @@ public class VoiceSearchWidget extends UIDialog implements WidgetManagerDelegate.PermissionListener, Application.ActivityLifecycleCallbacks { - private static final String LOGTAG = "VRB"; private static final int VOICESEARCH_AUDIO_REQUEST_CODE = 7455; private static final int ANIMATION_DURATION = 1000; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java index 0a7e9497e..c5081b4f9 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/SettingsWidget.java @@ -32,6 +32,7 @@ import org.mozilla.vrbrowser.ui.widgets.dialogs.RestartDialogWidget; import org.mozilla.vrbrowser.ui.widgets.dialogs.UIDialog; import org.mozilla.vrbrowser.ui.widgets.prompts.AlertPromptWidget; +import org.mozilla.vrbrowser.utils.SystemUtils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -40,7 +41,6 @@ import java.util.GregorianCalendar; public class SettingsWidget extends UIDialog implements WidgetManagerDelegate.WorldClickListener, SettingsView.Delegate { - private static final String LOGTAG = "VRB"; private AudioEngine mAudio; private SettingsView mCurrentView; private TextView mBuildText; diff --git a/app/src/common/shared/org/mozilla/vrbrowser/utils/SystemUtils.java b/app/src/common/shared/org/mozilla/vrbrowser/utils/SystemUtils.java index 10452a4c8..e5503348c 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/utils/SystemUtils.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/utils/SystemUtils.java @@ -36,4 +36,8 @@ public static final void scheduleRestart(@NonNull Context context, long delay) { System.exit(0); } + @NonNull + public static String createLogtag(@NonNull Class aClass) { + return "VRB[" + aClass.getSimpleName() + "]"; + } } diff --git a/app/src/googlevr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/googlevr/java/org/mozilla/vrbrowser/PlatformActivity.java index b6d04e928..085fd88a6 100644 --- a/app/src/googlevr/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/googlevr/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -14,6 +14,8 @@ import android.view.View; import android.view.WindowManager; +import org.mozilla.vrbrowser.utils.SystemUtils; + import com.google.vr.ndk.base.AndroidCompat; import com.google.vr.ndk.base.GvrLayout; @@ -23,8 +25,7 @@ import javax.microedition.khronos.opengles.GL10; public class PlatformActivity extends Activity { - static String LOGTAG = "VRB"; - + static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class); public static boolean filterPermission(final String aPermission) { return false; } diff --git a/app/src/noapi/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/noapi/java/org/mozilla/vrbrowser/PlatformActivity.java index 9630dbe13..80cd1a66b 100644 --- a/app/src/noapi/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/noapi/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -15,6 +15,8 @@ import android.widget.ImageButton; import android.widget.TextView; +import org.mozilla.vrbrowser.utils.SystemUtils; + import java.util.ArrayList; import javax.microedition.khronos.egl.EGLConfig; @@ -23,7 +25,7 @@ import androidx.annotation.Keep; public class PlatformActivity extends Activity { - static String LOGTAG = "VRB"; + static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class); static final float ROTATION = 0.098174770424681f; public static boolean filterPermission(final String aPermission) { diff --git a/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java index ad1730626..8f81dfa57 100644 --- a/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -12,8 +12,10 @@ import android.view.View; import android.view.WindowManager; +import org.mozilla.vrbrowser.utils.SystemUtils; + public class PlatformActivity extends NativeActivity { - static String LOGTAG = "VRB"; + static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class); public static boolean filterPermission(final String aPermission) { if (aPermission.equals(Manifest.permission.CAMERA)) { diff --git a/app/src/svr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/svr/java/org/mozilla/vrbrowser/PlatformActivity.java index da436b044..9668d7e10 100644 --- a/app/src/svr/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/svr/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -14,10 +14,12 @@ import android.view.View; import android.view.WindowManager; +import org.mozilla.vrbrowser.utils.SystemUtils; + import com.osterhoutgroup.api.ext.OdgHardwareExt; public class PlatformActivity extends NativeActivity { - static String LOGTAG = "VRBrowser"; + static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class); private OdgHardwareExt mOdgHardware; public static boolean filterPermission(final String aPermission) { diff --git a/app/src/wavevr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/wavevr/java/org/mozilla/vrbrowser/PlatformActivity.java index a147ee7f3..19563df95 100644 --- a/app/src/wavevr/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/wavevr/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -11,8 +11,10 @@ import android.content.res.AssetManager; import android.os.Bundle; +import org.mozilla.vrbrowser.utils.SystemUtils; + public class PlatformActivity extends VRActivity { - static final String LOGTAG = "VRB"; + static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class); public static boolean filterPermission(final String aPermission) { if (aPermission.equals(Manifest.permission.CAMERA)) {