diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerExecutor.java similarity index 96% rename from ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerManager.java rename to ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerExecutor.java index 150fc609755..655d91985e1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaScriptTimerExecutor.java @@ -10,7 +10,7 @@ package com.facebook.react.modules.core; import com.facebook.react.bridge.WritableArray; /** An interface used by {@link JavaTimerManager} to access and call JS timers from Java. */ -public interface JavaScriptTimerManager { +public interface JavaScriptTimerExecutor { /** * Calls the JS callback(s) associated with the timer ID(s). Also unregisters the callback if the diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java index 00e2862a216..c9329fb2f51 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/JavaTimerManager.java @@ -81,7 +81,7 @@ public class JavaTimerManager { } if (mTimersToCall != null) { - mJavaScriptTimerManager.callTimers(mTimersToCall); + mJavaScriptTimerExecutor.callTimers(mTimersToCall); mTimersToCall = null; } @@ -139,7 +139,7 @@ public class JavaTimerManager { } if (sendIdleEvents) { - mJavaScriptTimerManager.callIdleCallbacks(absoluteFrameStartTime); + mJavaScriptTimerExecutor.callIdleCallbacks(absoluteFrameStartTime); } mCurrentIdleCallbackRunnable = null; @@ -151,7 +151,7 @@ public class JavaTimerManager { } private final ReactApplicationContext mReactApplicationContext; - private final JavaScriptTimerManager mJavaScriptTimerManager; + private final JavaScriptTimerExecutor mJavaScriptTimerExecutor; private final ReactChoreographer mReactChoreographer; private final DevSupportManager mDevSupportManager; private final Object mTimerGuard = new Object(); @@ -169,11 +169,11 @@ public class JavaTimerManager { public JavaTimerManager( ReactApplicationContext reactContext, - JavaScriptTimerManager javaScriptTimerManager, + JavaScriptTimerExecutor javaScriptTimerManager, ReactChoreographer reactChoreographer, DevSupportManager devSupportManager) { mReactApplicationContext = reactContext; - mJavaScriptTimerManager = javaScriptTimerManager; + mJavaScriptTimerExecutor = javaScriptTimerManager; mReactChoreographer = reactChoreographer; mDevSupportManager = devSupportManager; @@ -327,7 +327,7 @@ public class JavaTimerManager { if (mDevSupportManager.getDevSupportEnabled()) { long driftTime = Math.abs(remoteTime - deviceTime); if (driftTime > 60000) { - mJavaScriptTimerManager.emitTimeDriftWarning( + mJavaScriptTimerExecutor.emitTimeDriftWarning( "Debugger and device times have drifted by more than 60s. Please correct this by " + "running adb shell \"date `date +%m%d%H%M%Y.%S`\" on your debugger machine."); } @@ -338,7 +338,7 @@ public class JavaTimerManager { if (duration == 0 && !repeat) { WritableArray timerToCall = Arguments.createArray(); timerToCall.pushInt(callbackID); - mJavaScriptTimerManager.callTimers(timerToCall); + mJavaScriptTimerExecutor.callTimers(timerToCall); return; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java index b4337d0a512..94a8a5eca4c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java @@ -22,7 +22,7 @@ import com.facebook.react.module.annotations.ReactModule; public final class TimingModule extends NativeTimingSpec implements LifecycleEventListener, HeadlessJsTaskEventListener { - public class BridgeTimerManager implements JavaScriptTimerManager { + public class BridgeTimerExecutor implements JavaScriptTimerExecutor { @Override public void callTimers(WritableArray timerIDs) { ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); @@ -61,7 +61,7 @@ public final class TimingModule extends NativeTimingSpec mJavaTimerManager = new JavaTimerManager( reactContext, - new BridgeTimerManager(), + new BridgeTimerExecutor(), ReactChoreographer.getInstance(), devSupportManager); }