Rename CldAndroid to MediaManager

Author: Amir Tocker

lib/src/androidTest/java/com/cloudinary/android/AbstractTest.java

@@ -23,7 +23,7 @@ public class AbstractTest {
     @BeforeClass
     public synchronized static void initLibrary() {
         if (!initialized) {
-            CldAndroid.init(InstrumentationRegistry.getTargetContext(), new SignatureProvider() {
+            MediaManager.init(InstrumentationRegistry.getTargetContext(), new SignatureProvider() {
                 @Override
                 public Signature provideSignature(Map options) {
                     return null;
@@ -34,7 +34,7 @@ public String getName() {
                     return null;
                 }
             });
-            CldAndroid.get().getCloudinary().config.apiSecret = null;
+            MediaManager.get().getCloudinary().config.apiSecret = null;
             initialized = true;
         }
     }

lib/src/main/java/com/cloudinary/android/AndroidJobStrategy.java

@@ -200,7 +200,7 @@ protected Result onRunJob(Params params) {
             wl.acquire();
             try {
                 // call the generic processor:
-                UploadStatus result = CldAndroid.get().processRequest(getContext(), new AndroidJobRequestParams(params.getExtras()));
+                UploadStatus result = MediaManager.get().processRequest(getContext(), new AndroidJobRequestParams(params.getExtras()));
                 return adaptResult(result);
             } finally {
                 wl.release();

lib/src/main/java/com/cloudinary/android/DefaultCallbackDispatcher.java

@@ -150,8 +150,8 @@ public void wakeListenerServiceWithRequestStart(Context appContext, String reque
         // if the service is already 'awake' it will receive events via callback. If we send the intent the event will be received twice.
         if (listenerServiceClass != null && !isListenerServiceAlreadyRegistered) {
             appContext.startService(new Intent(appContext, listenerServiceClass)
-                    .setAction(CldAndroid.ACTION_REQUEST_STARTED)
-                    .putExtra(CldAndroid.INTENT_EXTRA_REQUEST_ID, requestId));
+                    .setAction(MediaManager.ACTION_REQUEST_STARTED)
+                    .putExtra(MediaManager.INTENT_EXTRA_REQUEST_ID, requestId));
         }
     }
 
@@ -165,9 +165,9 @@ public void wakeListenerServiceWithRequestFinished(Context appContext, String re
         // if the service is already 'awake' it will receive events via callback. If we send the intent the event will be received twice.
         if (listenerServiceClass != null && !isListenerServiceAlreadyRegistered) {
             appContext.startService(new Intent(appContext, listenerServiceClass)
-                    .setAction(CldAndroid.ACTION_REQUEST_FINISHED)
-                    .putExtra(CldAndroid.INTENT_EXTRA_REQUEST_ID, requestId)
-                    .putExtra(CldAndroid.INTENT_EXTRA_REQUEST_RESULT_STATUS, uploadStatus));
+                    .setAction(MediaManager.ACTION_REQUEST_FINISHED)
+                    .putExtra(MediaManager.INTENT_EXTRA_REQUEST_ID, requestId)
+                    .putExtra(MediaManager.INTENT_EXTRA_REQUEST_RESULT_STATUS, uploadStatus));
         }
     }
 

lib/src/main/java/com/cloudinary/android/DefaultRequestDispatcher.java

@@ -26,7 +26,7 @@ public final String dispatch(UploadRequest request) {
         // Requests will be started once there's more room
         int totalCount = strategy.getPendingImmediateJobsCount() + strategy.getRunningJobsCount();
 
-        if (!request.getTimeWindow().isImmediate() && totalCount >= CldAndroid.get().getGlobalUploadPolicy().getMaxConcurrentRequests()) {
+        if (!request.getTimeWindow().isImmediate() && totalCount >= MediaManager.get().getGlobalUploadPolicy().getMaxConcurrentRequests()) {
             int minutes = 10 + rand.nextInt(10);
             request.defferByMinutes(minutes);
             Logger.d(TAG, String.format("Request %s deferred by %d minutes.", requestId, minutes));

lib/src/main/java/com/cloudinary/android/DefaultRequestProcessor.java

@@ -49,7 +49,7 @@ public UploadStatus processRequest(Context context, RequestParams params) {
         final String requestId = params.getString("requestId", null);
         final String uri = params.getString("uri", null);
         final String optionsAsString = params.getString("options", null);
-        final int maxErrorRetries = params.getInt("maxErrorRetries", CldAndroid.get().getGlobalUploadPolicy().getMaxErrorRetries());
+        final int maxErrorRetries = params.getInt("maxErrorRetries", MediaManager.get().getGlobalUploadPolicy().getMaxErrorRetries());
         final int errorCount = params.getInt("errorCount", 0);
 
         Logger.i(TAG, String.format("Processing Request %s.", requestId));
@@ -81,7 +81,7 @@ public UploadStatus processRequest(Context context, RequestParams params) {
             if (StringUtils.isNotBlank(uri)) {
                 Payload payload = PayloadFactory.fromUri(uri);
                 if (payload != null) {
-                    int maxConcurrentRequests = CldAndroid.get().getGlobalUploadPolicy().getMaxConcurrentRequests();
+                    int maxConcurrentRequests = MediaManager.get().getGlobalUploadPolicy().getMaxConcurrentRequests();
                     int runningJobsCount = runningJobs.get();
                     if (runningJobsCount < maxConcurrentRequests) {
                         try {
@@ -177,8 +177,8 @@ private Map doProcess(final String requestId, Context appContext, Map<String, Ob
         }
 
         // if there are no credentials and the request is NOT unsigned - activate the signature provider (if present).
-        if (!CldAndroid.get().hasCredentials() && !TRUE.equals(options.get("unsigned"))) {
-            SignatureProvider signatureProvider = CldAndroid.get().getSignatureProvider();
+        if (!MediaManager.get().hasCredentials() && !TRUE.equals(options.get("unsigned"))) {
+            SignatureProvider signatureProvider = MediaManager.get().getSignatureProvider();
             if (signatureProvider != null) {
                 try {
                     Signature signature = signatureProvider.provideSignature(options);
@@ -194,7 +194,7 @@ private Map doProcess(final String requestId, Context appContext, Map<String, Ob
         final ProcessorCallback processorCallback = new ProcessorCallback(actualTotalBytes, offset, callbackDispatcher, requestId);
 
         try {
-            return CldAndroid.get().getCloudinary().uploader().uploadLarge(preparedPayload, options, bufferSize, offset, uploadUniqueId, processorCallback);
+            return MediaManager.get().getCloudinary().uploader().uploadLarge(preparedPayload, options, bufferSize, offset, uploadUniqueId, processorCallback);
         } finally {
             // save data into persisted request params to enable resuming later on
             params.putInt("original_buffer_size", bufferSize);

…a/com/cloudinary/android/CldAndroid.java …com/cloudinary/android/MediaManager.javalib/src/main/java/com/cloudinary/android/CldAndroid.java renamed to lib/src/main/java/com/cloudinary/android/MediaManager.java lib/src/main/java/com/cloudinary/android/CldAndroid.java renamed to lib/src/main/java/com/cloudinary/android/MediaManager.java

@@ -26,18 +26,18 @@
 import java.util.Map;
 
 /**
- * Main class used as entry point to any operation against Cloudinary. Use {@link CldAndroid#get()} to get an instance.
+ * Main class used as entry point to any operation against Cloudinary. Use {@link MediaManager#get()} to get an instance.
  * Must be initialized before use, see {@link #init(Context, SignatureProvider, Map)}.
  */
-public class CldAndroid {
+public class MediaManager {
 
     public static final String INTENT_EXTRA_REQUEST_ID = "INTENT_EXTRA_REQUEST_ID";
     public static final String INTENT_EXTRA_REQUEST_RESULT_STATUS = "INTENT_EXTRA_REQUEST_RESULT_STATUS";
     public static final String ACTION_REQUEST_STARTED = "com.cloudinary.ACTION_REQUEST_STARTED";
     public static final String ACTION_REQUEST_FINISHED = "com.cloudinary.ACTION_REQUEST_FINISHED";
-    private static final String TAG = CldAndroid.class.getSimpleName();
+    private static final String TAG = MediaManager.class.getSimpleName();
 
-    private static CldAndroid _instance;
+    private static MediaManager _instance;
 
     private final com.cloudinary.Cloudinary cloudinary;
     private final RequestDispatcher requestDispatcher;
@@ -49,7 +49,7 @@ public class CldAndroid {
 
     private GlobalUploadPolicy globalUploadPolicy = GlobalUploadPolicy.defaultPolicy();
 
-    private CldAndroid(@NonNull Context context, @Nullable SignatureProvider signatureProvider, @Nullable Map config) {
+    private MediaManager(@NonNull Context context, @Nullable SignatureProvider signatureProvider, @Nullable Map config) {
         // use context to initialize components but DO NOT store it
         strategy = BackgroundStrategyProvider.provideStrategy();
         callbackDispatcher = new DefaultCallbackDispatcher(context);
@@ -97,7 +97,7 @@ public void onReschedule(String requestId, ErrorInfo error) {
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context Android context for initializations. Does not get cached.
      */
@@ -106,7 +106,7 @@ public static void init(@NonNull Context context) {
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context Android context for initializations. Does not get cached.
      * @param config  Cloudinary configuration parameters. If not supplied a cloudinary-url metadata must exist in the manifest.
@@ -116,7 +116,7 @@ public static void init(@NonNull Context context, @Nullable Map config) {
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context Android context for initializations. Does not get cached.
      * @param config  Cloudinary configuration parameters. If not supplied a cloudinary-url metadata must exist in the manifest.
@@ -131,7 +131,7 @@ public static void init(@NonNull Context context, @Nullable Configuration config
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context           Android context for initializations. Does not get cached.
      * @param signatureProvider A signature provider. Needed if using signed uploads.
@@ -141,30 +141,30 @@ public static void init(@NonNull Context context, @Nullable SignatureProvider si
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context  Android context for initializations. Does not get cached.
      * @param provider A signature provider. Needed if using signed uploads.
      * @param config   Cloudinary configuration parameters. If not supplied a cloudinary-url metadata must exist in the manifest.
      */
     public static void init(@NonNull Context context, @Nullable SignatureProvider provider, @Nullable Map config) {
-        synchronized (CldAndroid.class) {
+        synchronized (MediaManager.class) {
             //noinspection ConstantConditions
             if (context == null) {
                 throw new IllegalArgumentException("context cannot be null.");
             }
 
 
             if (_instance == null) {
-                _instance = new CldAndroid(context, provider, config);
+                _instance = new MediaManager(context, provider, config);
             } else {
-                throw new IllegalStateException("CldAndroid is already initialized");
+                throw new IllegalStateException("MediaManager is already initialized");
             }
         }
     }
 
     /**
-     * Setup the library with the required parameters. A flavor of init() must be called once before CldAndroid can be used, preferably in an implementation of {@link Application#onCreate()}.
+     * Setup the library with the required parameters. A flavor of init() must be called once before MediaManager can be used, preferably in an implementation of {@link Application#onCreate()}.
      *
      * @param context  Android context for initializations. Does not get cached.
      * @param provider A signature provider. Needed if using signed uploads.
@@ -181,9 +181,9 @@ public static void init(@NonNull Context context, @Nullable SignatureProvider pr
     /**
      * Entry point for any operation against Cloudinary
      *
-     * @return An instance of the CldAndroid class to run operations against cloudinary.
+     * @return An instance of the MediaManager class to run operations against cloudinary.
      */
-    public static CldAndroid get() {
+    public static MediaManager get() {
         if (_instance == null) {
             throw new IllegalStateException("Must call init() before accessing Cloudinary.");
         }
@@ -192,7 +192,7 @@ public static CldAndroid get() {
     }
 
     /**
-     * Set the log level. In order to affect initialization logging this can be set before calling {@link CldAndroid#init(Context)}.
+     * Set the log level. In order to affect initialization logging this can be set before calling {@link MediaManager#init(Context)}.
      *
      * @param logLevel The log level to set, see {@link LogLevel}.
      */

lib/src/main/java/com/cloudinary/android/UploadRequest.java

@@ -17,15 +17,15 @@
 /**
  * A request to upload a single {@link Payload} to Cloudinary. Note: Once calling {@link #dispatch()} the request is sealed and any
  * attempt to modify it will produce an {@link IllegalStateException}. If there's a need to change a request after dispatching,
- * it needs to be cancelled ({@link CldAndroid#cancelRequest(String)}) and a new request should be dispatched in it's place.
+ * it needs to be cancelled ({@link MediaManager#cancelRequest(String)}) and a new request should be dispatched in it's place.
  * @param <T> The payload type this request will upload
  */
 public class UploadRequest<T extends Payload> {
     private final UploadContext<T> uploadContext;
     private final String requestId = UUID.randomUUID().toString();
     private final Object optionsLockObject = new Object();
     private boolean dispatched = false;
-    private UploadPolicy uploadPolicy = CldAndroid.get().getGlobalUploadPolicy();
+    private UploadPolicy uploadPolicy = MediaManager.get().getGlobalUploadPolicy();
     private TimeWindow timeWindow = TimeWindow.getDefault();
     private UploadCallback callback;
     private Map<String, Object> options;
@@ -126,7 +126,7 @@ public synchronized String dispatch() {
             throw new InvalidParamsException("Parameters must be serializable", e);
         }
 
-        CldAndroid.get().registerCallback(requestId, callback);
+        MediaManager.get().registerCallback(requestId, callback);
         uploadContext.getDispatcher().dispatch(this);
 
         return requestId;
@@ -210,13 +210,13 @@ public void onProgress(String requestId, long bytes, long totalBytes) {
         @Override
         public void onSuccess(String requestId, Map resultData) {
             callback.onSuccess(requestId, resultData);
-            CldAndroid.get().unregisterCallback(this);
+            MediaManager.get().unregisterCallback(this);
         }
 
         @Override
         public void onError(String requestId, ErrorInfo error) {
             callback.onError(requestId, error);
-            CldAndroid.get().unregisterCallback(this);
+            MediaManager.get().unregisterCallback(this);
         }
 
         @Override

lib/src/main/java/com/cloudinary/android/callback/ListenerService.java

@@ -3,7 +3,7 @@
 import android.app.Service;
 import android.content.Intent;
 
-import com.cloudinary.android.CldAndroid;
+import com.cloudinary.android.MediaManager;
 import com.cloudinary.utils.StringUtils;
 
 /**
@@ -24,20 +24,20 @@ public abstract class ListenerService extends Service implements UploadCallback{
     @Override
     public void onCreate() {
         super.onCreate();
-        CldAndroid.get().registerCallback(this);
+        MediaManager.get().registerCallback(this);
     }
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (intent != null) {
-            final String requestId = intent.getStringExtra(CldAndroid.INTENT_EXTRA_REQUEST_ID);
+            final String requestId = intent.getStringExtra(MediaManager.INTENT_EXTRA_REQUEST_ID);
 
             if (StringUtils.isNotBlank(requestId)) {
-                if (CldAndroid.ACTION_REQUEST_STARTED.equals(intent.getAction())){
+                if (MediaManager.ACTION_REQUEST_STARTED.equals(intent.getAction())){
                     onStart(requestId);
-                } else if (CldAndroid.ACTION_REQUEST_FINISHED.equals(intent.getAction())){
-                    UploadStatus result = (UploadStatus) intent.getSerializableExtra(CldAndroid.INTENT_EXTRA_REQUEST_RESULT_STATUS);
-                    UploadResult uploadResult = CldAndroid.get().popPendingResult(requestId);
+                } else if (MediaManager.ACTION_REQUEST_FINISHED.equals(intent.getAction())){
+                    UploadStatus result = (UploadStatus) intent.getSerializableExtra(MediaManager.INTENT_EXTRA_REQUEST_RESULT_STATUS);
+                    UploadResult uploadResult = MediaManager.get().popPendingResult(requestId);
 
                     // ACTION_REQUEST_FINISHED means either success or failure:
                     if (result == UploadStatus.FAILURE) {
@@ -55,6 +55,6 @@ public int onStartCommand(Intent intent, int flags, int startId) {
     @Override
     public void onDestroy() {
         super.onDestroy();
-        CldAndroid.get().unregisterCallback(this);
+        MediaManager.get().unregisterCallback(this);
     }
 }

lib/src/main/java/com/cloudinary/android/signed/SignatureProvider.java

@@ -2,13 +2,13 @@
 
 import android.content.Context;
 
-import com.cloudinary.android.CldAndroid;
+import com.cloudinary.android.MediaManager;
 import com.cloudinary.android.UploadRequest;
 
 import java.util.Map;
 
 /**
- * Provide an implementation of this class to {@link CldAndroid#init(Context, SignatureProvider, Map)} to enable signed uploads.
+ * Provide an implementation of this class to {@link MediaManager#init(Context, SignatureProvider, Map)} to enable signed uploads.
  * Note: If an api key and secret are provided to the library this interface is not required.
  */
 public interface SignatureProvider {