diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java index 7356b048c19..25780267549 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java @@ -293,23 +293,27 @@ public class CameraRollManager extends ReactContextBaseJavaModule { selectionArgs.add(mGroupName); } - if (mAssetType.equals(ASSET_TYPE_PHOTOS)) { - selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " = " - + MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE); - } else if (mAssetType.equals(ASSET_TYPE_VIDEOS)) { - selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " = " - + MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO); - } else if (mAssetType.equals(ASSET_TYPE_ALL)) { - selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " IN (" - + MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO + "," - + MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE + ")"); - } else { - mPromise.reject( - ERROR_UNABLE_TO_FILTER, - "Invalid filter option: '" + mAssetType + "'. Expected one of '" - + ASSET_TYPE_PHOTOS + "', '" + ASSET_TYPE_VIDEOS + "' or '" + ASSET_TYPE_ALL + "'." - ); - return; + switch (mAssetType) { + case ASSET_TYPE_PHOTOS: + selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " = " + + MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE); + break; + case ASSET_TYPE_VIDEOS: + selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " = " + + MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO); + break; + case ASSET_TYPE_ALL: + selection.append(" AND " + MediaStore.Files.FileColumns.MEDIA_TYPE + " IN (" + + MediaStore.Files.FileColumns.MEDIA_TYPE_VIDEO + "," + + MediaStore.Files.FileColumns.MEDIA_TYPE_IMAGE + ")"); + break; + default: + mPromise.reject( + ERROR_UNABLE_TO_FILTER, + "Invalid filter option: '" + mAssetType + "'. Expected one of '" + + ASSET_TYPE_PHOTOS + "', '" + ASSET_TYPE_VIDEOS + "' or '" + ASSET_TYPE_ALL + "'." + ); + return; } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java index 153f800f775..161a7cc19cc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/VibrationModule.java @@ -42,13 +42,12 @@ public class VibrationModule extends ReactContextBaseJavaModule { @ReactMethod public void vibrateByPattern(ReadableArray pattern, int repeat) { - long[] patternLong = new long[pattern.size()]; - for (int i = 0; i < pattern.size(); i++) { - patternLong[i] = pattern.getInt(i); - } - Vibrator v = (Vibrator) getReactApplicationContext().getSystemService(Context.VIBRATOR_SERVICE); if (v != null) { + long[] patternLong = new long[pattern.size()]; + for (int i = 0; i < pattern.size(); i++) { + patternLong[i] = pattern.getInt(i); + } v.vibrate(patternLong, repeat); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java index f28f271f7f0..c2c4021ed3c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java @@ -342,12 +342,19 @@ public final class WebSocketModule extends ReactContextBaseJavaModule { String scheme = ""; URI requestURI = new URI(uri); - if (requestURI.getScheme().equals("wss")) { - scheme += "https"; - } else if (requestURI.getScheme().equals("ws")) { - scheme += "http"; - } else if (requestURI.getScheme().equals("http") || requestURI.getScheme().equals("https")) { - scheme += requestURI.getScheme(); + switch (requestURI.getScheme()) { + case "wss": + scheme += "https"; + break; + case "ws": + scheme += "http"; + break; + case "http": + case "https": + scheme += requestURI.getScheme(); + break; + default: + break; } if (requestURI.getPort() != -1) {