Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Commit 4757ed2

Browse files
committed
remove enclosing else
1 parent e544e04 commit 4757ed2

File tree

1 file changed

+37
-36
lines changed
  • android/app/src/main/java/com/microsoft/codepush/react

1 file changed

+37
-36
lines changed

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -429,50 +429,51 @@ public void getNewStatusReport(final Promise promise) {
429429
if (isDebugMode) {
430430
// Do not report metrics if running in debug mode.
431431
promise.resolve("");
432-
} else {
433-
AsyncTask asyncTask = new AsyncTask() {
434-
@Override
435-
protected Void doInBackground(Object... params) {
436-
if (needToReportRollback) {
437-
needToReportRollback = false;
438-
JSONArray failedUpdates = getFailedUpdates();
439-
if (failedUpdates != null && failedUpdates.length() > 0) {
440-
try {
441-
JSONObject lastFailedPackageJSON = failedUpdates.getJSONObject(failedUpdates.length() - 1);
442-
WritableMap lastFailedPackage = CodePushUtils.convertJsonObjectToWriteable(lastFailedPackageJSON);
443-
WritableMap failedStatusReport = codePushTelemetryManager.getRollbackReport(lastFailedPackage);
444-
if (failedStatusReport != null) {
445-
promise.resolve(failedStatusReport);
446-
return null;
447-
}
448-
} catch (JSONException e) {
449-
throw new CodePushUnknownException("Unable to read failed updates information stored in SharedPreferences.", e);
450-
}
451-
}
452-
} else if (didUpdate) {
453-
WritableMap currentPackage = codePushPackage.getCurrentPackage();
454-
if (currentPackage != null) {
455-
WritableMap newPackageStatusReport = codePushTelemetryManager.getUpdateReport(currentPackage);
456-
if (newPackageStatusReport != null) {
457-
promise.resolve(newPackageStatusReport);
432+
return;
433+
}
434+
435+
AsyncTask asyncTask = new AsyncTask() {
436+
@Override
437+
protected Void doInBackground(Object... params) {
438+
if (needToReportRollback) {
439+
needToReportRollback = false;
440+
JSONArray failedUpdates = getFailedUpdates();
441+
if (failedUpdates != null && failedUpdates.length() > 0) {
442+
try {
443+
JSONObject lastFailedPackageJSON = failedUpdates.getJSONObject(failedUpdates.length() - 1);
444+
WritableMap lastFailedPackage = CodePushUtils.convertJsonObjectToWriteable(lastFailedPackageJSON);
445+
WritableMap failedStatusReport = codePushTelemetryManager.getRollbackReport(lastFailedPackage);
446+
if (failedStatusReport != null) {
447+
promise.resolve(failedStatusReport);
458448
return null;
459449
}
450+
} catch (JSONException e) {
451+
throw new CodePushUnknownException("Unable to read failed updates information stored in SharedPreferences.", e);
460452
}
461-
} else if (isRunningBinaryVersion) {
462-
WritableMap newAppVersionStatusReport = codePushTelemetryManager.getBinaryUpdateReport(appVersion);
463-
if (newAppVersionStatusReport != null) {
464-
promise.resolve(newAppVersionStatusReport);
453+
}
454+
} else if (didUpdate) {
455+
WritableMap currentPackage = codePushPackage.getCurrentPackage();
456+
if (currentPackage != null) {
457+
WritableMap newPackageStatusReport = codePushTelemetryManager.getUpdateReport(currentPackage);
458+
if (newPackageStatusReport != null) {
459+
promise.resolve(newPackageStatusReport);
465460
return null;
466461
}
467462
}
468-
469-
promise.resolve("");
470-
return null;
463+
} else if (isRunningBinaryVersion) {
464+
WritableMap newAppVersionStatusReport = codePushTelemetryManager.getBinaryUpdateReport(appVersion);
465+
if (newAppVersionStatusReport != null) {
466+
promise.resolve(newAppVersionStatusReport);
467+
return null;
468+
}
471469
}
472-
};
473470

474-
asyncTask.execute();
475-
}
471+
promise.resolve("");
472+
return null;
473+
}
474+
};
475+
476+
asyncTask.execute();
476477
}
477478

478479
@ReactMethod

0 commit comments

Comments
 (0)