From 5b711fcec68f8ebdb5a7c068922b3dfc5908464d Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Mon, 31 Aug 2020 19:23:19 -0400 Subject: [PATCH] Lint: control flow issues --- .../java/org/microg/gms/cast/CastDeviceControllerImpl.java | 6 ++---- .../java/org/microg/gms/common/DeviceConfiguration.java | 6 ++---- .../src/main/java/org/microg/gms/gcm/McsService.java | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java b/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java index e93e3c13..60879308 100644 --- a/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java +++ b/play-services-core/src/main/java/org/microg/gms/cast/CastDeviceControllerImpl.java @@ -147,12 +147,10 @@ public class CastDeviceControllerImpl extends ICastDeviceController.Stub impleme switch (message.getPayloadType()) { case STRING: String response = message.getPayloadUtf8(); - if (requestId == null) { - this.onTextMessageReceived(message.getNamespace(), response); - } else { + if (requestId != null) { this.onSendMessageSuccess(response, requestId); - this.onTextMessageReceived(message.getNamespace(), response); } + this.onTextMessageReceived(message.getNamespace(), response); break; case BINARY: byte[] payload = message.getPayloadBinary(); diff --git a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java index 411de8aa..66843495 100644 --- a/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java +++ b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java @@ -153,9 +153,7 @@ public class DeviceConfiguration { if (eglcontext != EGL10.EGL_NO_CONTEXT) { javax.microedition.khronos.egl.EGLSurface eglsurface = egl10.eglCreatePbufferSurface(egldisplay, eglconfig, ai); - if (eglsurface == EGL10.EGL_NO_SURFACE) { - egl10.eglDestroyContext(egldisplay, eglcontext); - } else { + if (eglsurface != EGL10.EGL_NO_SURFACE) { egl10.eglMakeCurrent(egldisplay, eglsurface, eglsurface, eglcontext); String s = GLES10.glGetString(7939); if (s != null && !s.isEmpty()) { @@ -168,8 +166,8 @@ public class DeviceConfiguration { } egl10.eglMakeCurrent(egldisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT); egl10.eglDestroySurface(egldisplay, eglsurface); - egl10.eglDestroyContext(egldisplay, eglcontext); } + egl10.eglDestroyContext(egldisplay, eglcontext); } } } diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java index c18a3e56..1dd26a95 100644 --- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java +++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java @@ -647,11 +647,8 @@ public class McsService extends Service implements Handler.Callback { } private void handleOutputDone(android.os.Message msg) { - switch (msg.arg1) { - case MCS_HEARTBEAT_PING_TAG: - wakeLock.release(); - break; - default: + if (msg.arg1 == MCS_HEARTBEAT_PING_TAG) { + wakeLock.release(); } }