forceContentUpdate with boolean flag (#477)

* Add callback with success flag to FCU

* Fix PowerMock and lambdas issue

Author: hborisoff

AndroidSDKCore/src/main/java/com/leanplum/Leanplum.java

@@ -25,9 +25,11 @@
 import android.location.Location;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.leanplum.ActionContext.ContextualValues;
 import com.leanplum.callbacks.ActionCallback;
+import com.leanplum.callbacks.ForceContentUpdateCallback;
 import com.leanplum.callbacks.MessageDisplayedCallback;
 import com.leanplum.callbacks.RegisterDeviceCallback;
 import com.leanplum.callbacks.RegisterDeviceFinishedCallback;
@@ -2018,7 +2020,7 @@ private static void resumeStateInternal() {
    * inconsistent state or user experience.
    */
   public static void forceContentUpdate() {
-    forceContentUpdate(null);
+    forceContentUpdate(success -> {});
   }
 
   /**
@@ -2029,10 +2031,26 @@ public static void forceContentUpdate() {
    * @param callback The callback to invoke when the call completes from the server. The callback
    * will fire regardless of whether the variables have changed.
    */
-  @SuppressWarnings("SameParameterValue")
-  public static void forceContentUpdate(final VariablesChangedCallback callback) {
+  public static void forceContentUpdate(VariablesChangedCallback callback) {
+    forceContentUpdate(success -> {
+      if (callback != null) {
+        callback.variablesChanged();
+      }
+    });
+  }
+
+  /**
+   * Forces content to update from the server. If variables have changed, the appropriate callbacks
+   * will fire. Use sparingly as if the app is updated, you'll have to deal with potentially
+   * inconsistent state or user experience.
+   *
+   * @param callback The callback to invoke when the call completes from the server. The callback
+   *                 will fire regardless of whether the variables have changed. Null value is not
+   *                 permitted.
+   */
+  public static void forceContentUpdate(@NonNull ForceContentUpdateCallback callback) {
     if (Constants.isNoop()) {
-      OperationQueue.sharedInstance().addUiOperation(callback);
+      OperationQueue.sharedInstance().addUiOperation(() -> callback.onContentUpdated(false));
       return;
     }
     try {
@@ -2064,7 +2082,7 @@ public void response(JSONObject response) {
               Map<String, String> filenameToURLs = parseFilenameToURLs(response);
               FileManager.setFilenameToURLs(filenameToURLs);
             }
-            OperationQueue.sharedInstance().addUiOperation(callback);
+            OperationQueue.sharedInstance().addUiOperation(() -> callback.onContentUpdated(true));
           } catch (Throwable t) {
             Log.exception(t);
           }
@@ -2073,7 +2091,7 @@ public void response(JSONObject response) {
       req.onError(new Request.ErrorCallback() {
         @Override
         public void error(Exception e) {
-          OperationQueue.sharedInstance().addUiOperation(callback);
+          OperationQueue.sharedInstance().addUiOperation(() -> callback.onContentUpdated(false));
           LeanplumInbox.getInstance().triggerInboxSyncedWithStatus(false);
         }
       });

AndroidSDKCore/src/main/java/com/leanplum/callbacks/ForceContentUpdateCallback.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.leanplum.callbacks;
+
+/**
+ * Callback with success flag when updating content from server.
+ */
+public interface ForceContentUpdateCallback {
+
+  /**
+   * Called after content has been updated.
+   *
+   * @param success True if content is successfully updated, false otherwise.
+   */
+  void onContentUpdated(boolean success);
+}

AndroidSDKTests/build.gradle

@@ -79,10 +79,10 @@ dependencies {
     }
     testImplementation 'org.robolectric:shadows-play-services:3.3.2'
     testImplementation 'org.mockito:mockito-core:1.10.19'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.6'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.6'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.6'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.6'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.5'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.5'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.5'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.5'
     testImplementation 'org.bouncycastle:bcmail-jdk15on:1.65'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'