More fixes.

This commit is contained in:
Relintai 2023-01-16 01:55:43 +01:00
parent ee1a7ad8ce
commit 7b0a6b3da8
6 changed files with 12 additions and 12 deletions

View File

@ -146,7 +146,7 @@ public class APKExpansionPolicy implements Policy {
// Reset the licensing URL since it is only applicable for NOT_LICENSED responses. // Reset the licensing URL since it is only applicable for NOT_LICENSED responses.
setLicensingUrl(null); setLicensingUrl(null);
setValidityTimestamp(Long.toString(System.currentTimeMillis() + MILLIS_PER_MINUTE)); setValidityTimestamp(Long.toString(System.currentTimeMillis() + MILLIS_PER_MINUTE));
RBSet<String> keys = extras.keySet(); Set<String> keys = extras.keySet();
for (String key : keys) { for (String key : keys) {
if (key.equals("VT")) { if (key.equals("VT")) {
setValidityTimestamp(extras.get(key)); setValidityTimestamp(extras.get(key));

View File

@ -80,7 +80,7 @@ public class LicenseChecker implements ServiceConnection {
private Handler mHandler; private Handler mHandler;
private final String mPackageName; private final String mPackageName;
private final String mVersionCode; private final String mVersionCode;
private final RBSet<LicenseValidator> mChecksInProgress = new HashRBSet<LicenseValidator>(); private final Set<LicenseValidator> mChecksInProgress = new HashSet<LicenseValidator>();
private final Queue<LicenseValidator> mPendingChecks = new LinkedList<LicenseValidator>(); private final Queue<LicenseValidator> mPendingChecks = new LinkedList<LicenseValidator>();
/** /**

View File

@ -39,7 +39,7 @@ public class Dictionary extends HashMap<String, Object> {
public String[] get_keys() { public String[] get_keys() {
String[] ret = new String[size()]; String[] ret = new String[size()];
int i = 0; int i = 0;
RBSet<String> keys = keySet(); Set<String> keys = keySet();
for (String key : keys) { for (String key : keys) {
ret[i] = key; ret[i] = key;
i++; i++;
@ -51,7 +51,7 @@ public class Dictionary extends HashMap<String, Object> {
public Object[] get_values() { public Object[] get_values() {
Object[] ret = new Object[size()]; Object[] ret = new Object[size()];
int i = 0; int i = 0;
RBSet<String> keys = keySet(); Set<String> keys = keySet();
for (String key : keys) { for (String key : keys) {
ret[i] = get(key); ret[i] = get(key);
i++; i++;

View File

@ -306,7 +306,7 @@ public class PandemoniumInputHandler implements InputManager.InputDeviceListener
//Helps with creating new joypad mappings. //Helps with creating new joypad mappings.
Log.i(TAG, "=== New Input Device: " + joystick.name); Log.i(TAG, "=== New Input Device: " + joystick.name);
RBSet<Integer> already = new HashRBSet<>(); Set<Integer> already = new HashSet<>();
for (InputDevice.MotionRange range : device.getMotionRanges()) { for (InputDevice.MotionRange range : device.getMotionRanges()) {
boolean isJoystick = range.isFromSource(InputDevice.SOURCE_JOYSTICK); boolean isJoystick = range.isFromSource(InputDevice.SOURCE_JOYSTICK);
boolean isGamepad = range.isFromSource(InputDevice.SOURCE_GAMEPAD); boolean isGamepad = range.isFromSource(InputDevice.SOURCE_GAMEPAD);

View File

@ -130,11 +130,11 @@ public abstract class PandemoniumPlugin {
} }
private static Map<String, SignalInfo> registerPluginWithPandemoniumNative(Object pluginObject, private static Map<String, SignalInfo> registerPluginWithPandemoniumNative(Object pluginObject,
String pluginName, List<String> pluginMethods, RBSet<SignalInfo> pluginSignals, String pluginName, List<String> pluginMethods, Set<SignalInfo> pluginSignals,
RBSet<String> pluginGDNativeLibrariesPaths) { Set<String> pluginGDNativeLibrariesPaths) {
nativeRegisterSingleton(pluginName, pluginObject); nativeRegisterSingleton(pluginName, pluginObject);
RBSet<Method> filteredMethods = new HashRBSet<>(); Set<Method> filteredMethods = new HashSet<>();
Class<?> clazz = pluginObject.getClass(); Class<?> clazz = pluginObject.getClass();
Method[] methods = clazz.getDeclaredMethods(); Method[] methods = clazz.getDeclaredMethods();
@ -282,7 +282,7 @@ public abstract class PandemoniumPlugin {
* Returns the list of signals to be exposed to Pandemonium. * Returns the list of signals to be exposed to Pandemonium.
*/ */
@NonNull @NonNull
public RBSet<SignalInfo> getPluginSignals() { public Set<SignalInfo> getPluginSignals() {
return Collections.emptySet(); return Collections.emptySet();
} }
@ -292,7 +292,7 @@ public abstract class PandemoniumPlugin {
* The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file. * The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file.
*/ */
@NonNull @NonNull
protected RBSet<String> getPluginGDNativeLibrariesPaths() { protected Set<String> getPluginGDNativeLibrariesPaths() {
return Collections.emptySet(); return Collections.emptySet();
} }

View File

@ -49,7 +49,7 @@ public interface PandemoniumPluginInfoProvider {
* Returns the list of signals to be exposed to Pandemonium. * Returns the list of signals to be exposed to Pandemonium.
*/ */
@NonNull @NonNull
default RBSet<SignalInfo> getPluginSignals() { default Set<SignalInfo> getPluginSignals() {
return Collections.emptySet(); return Collections.emptySet();
} }
@ -59,7 +59,7 @@ public interface PandemoniumPluginInfoProvider {
* The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file. * The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file.
*/ */
@NonNull @NonNull
default RBSet<String> getPluginGDNativeLibrariesPaths() { default Set<String> getPluginGDNativeLibrariesPaths() {
return Collections.emptySet(); return Collections.emptySet();
} }