Enable usage of multiple instances

build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    buildToolsVersion "25.0.0"
     defaultConfig {
-        minSdkVersion 11
+        minSdkVersion 14
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 

src/main/java/com/infinario/android/infinariosdk/CommandManager.java

@@ -7,6 +7,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -17,23 +18,21 @@
  */
 public class CommandManager {
 
-    private static final int MAX_RETRIES = 20;
-
     DbQueue queue;
     HttpHelper http;
     Preferences preferences;
-    Object lockFlush;
+    final Object lockFlush;
     boolean flushInProgress;
     boolean flushMayNeedRestart;
     AsyncTask<Void, Void, Void> flushTask;
 
-    public CommandManager(Context context, String target, String userAgent) {
+    public CommandManager(Context context, String target, String userAgent, Preferences preferences) {
         queue = new DbQueue(context);
-        preferences = Preferences.get(context);
+        this.preferences = preferences;
         http = new HttpHelper(target, userAgent);
         lockFlush = new Object();
 
-        synchronized (lockFlush){
+        synchronized (lockFlush) {
             flushInProgress = false;
             flushMayNeedRestart = false;
         }
@@ -75,8 +74,8 @@ public boolean executeBatch() {
 
         StringBuilder logResult = new StringBuilder();
         logResult.append("Batch executed, ")
-                .append(requests.size())
-                .append(" prepared, ");
+          .append(requests.size())
+          .append(" prepared, ");
 
 
         if (data != null) {
@@ -105,17 +104,17 @@ public boolean executeBatch() {
                     }
                 }
                 logResult.append(successfulRequests.size())
-                        .append(" succeeded, ")
-                        .append(deleteRequests.size() - successfulRequests.size());
+                  .append(" succeeded, ")
+                  .append(deleteRequests.size() - successfulRequests.size());
             } else {
                 Log.e(Contract.TAG, "Results are null");
                 logResult.append("0 succeeded, ")
-                        .append(requests.size());
+                  .append(requests.size());
             }
         } else {
             Log.e(Contract.TAG, "Data is null");
             logResult.append("0 succeeded, ")
-                    .append(requests.size());
+              .append(requests.size());
         }
 
         logResult.append(" failed, rest was told to retry");
@@ -154,8 +153,8 @@ private void flushCommands(int maxRetries) {
 
             synchronized (lockFlush) {
                 if (!flushMayNeedRestart) {
-                     flushInProgress = false;
-                     break;
+                    flushInProgress = false;
+                    break;
                 }
                 flushMayNeedRestart = false;
             }
@@ -183,8 +182,8 @@ private int exponentialIncrease(int timeInMiliseconds)
         int calculateDelay = timeInMiliseconds * 2;
 
         return Contract.FLUSH_MAX_INTERVAL < calculateDelay
-                ? Contract.FLUSH_MAX_INTERVAL
-                : calculateDelay;
+          ? Contract.FLUSH_MAX_INTERVAL
+          : calculateDelay;
     }
 
     private JSONObject setCookieId(JSONObject command) {

src/main/java/com/infinario/android/infinariosdk/Contract.java

@@ -1,8 +1,5 @@
 package com.infinario.android.infinariosdk;
 
-import android.app.AlarmManager;
-import android.os.Build;
-
 /**
  * This file has been created by igi on 1/14/15.
  */
@@ -19,6 +16,11 @@ public class Contract {
     public static final String VERSION = "1.1.4";
     public static final String OS = "Android";
 
+    /**
+     * Preference files -> each Infinario instance has it's own preferences
+     */
+    public static final String SHARED_PREF_FILES = "shared_preference_files";
+
     /**
      * Preferences details
      */
@@ -74,7 +76,8 @@ public class Contract {
     public static final long FLUSH_DELAY = 10 * 1000;
     public static final int FLUSH_COUNT = 50;
     public static final boolean DEFAULT_AUTO_FLUSH = true;
-    public static int FLUSH_MIN_INTERVAL = 1000;
+  public static final java.lang.String PROJECT_PREFIX = "project_prefix";
+  public static int FLUSH_MIN_INTERVAL = 1000;
     public static int FLUSH_MAX_INTERVAL = 3600000;
 
     /**
@@ -97,13 +100,13 @@ public class Contract {
     public static final String COLUMN_COMMAND = "command";
     public static final String COLUMN_RETRIES = "retries";
 
-    public static final String DATABASE_NAME = "commands.db";
+    public static final String DATABASE_NAME_POSTFIX = "commands.db";
     public static final int DATABASE_VERSION = 1;
 
     // Database creation sql statement
     public static final String DATABASE_CREATE = "create table "
-            + TABLE_COMMANDS + "(" + COLUMN_ID
-            + " integer primary key autoincrement, " + COLUMN_COMMAND
-            + " text not null, " + COLUMN_RETRIES
-            + " integer not null default 0);";
+      + TABLE_COMMANDS + "(" + COLUMN_ID
+      + " integer primary key autoincrement, " + COLUMN_COMMAND
+      + " text not null, " + COLUMN_RETRIES
+      + " integer not null default 0);";
 }

src/main/java/com/infinario/android/infinariosdk/DbHelper.java

@@ -10,8 +10,8 @@
  */
 public class DbHelper extends SQLiteOpenHelper {
 
-    public DbHelper(Context context) {
-        super(context, Contract.DATABASE_NAME, null, Contract.DATABASE_VERSION);
+    public DbHelper(Context context, String dbName) {
+        super(context, dbName, null, Contract.DATABASE_VERSION);
     }
 
     @Override
@@ -22,10 +22,9 @@ public void onCreate(SQLiteDatabase database) {
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         Log.w(DbHelper.class.getName(),
-                "Upgrading database from version " + oldVersion + " to "
-                        + newVersion + ", which will destroy all old data");
+          "Upgrading database from version " + oldVersion + " to "
+            + newVersion + ", which will destroy all old data");
         db.execSQL("DROP TABLE IF EXISTS " + Contract.TABLE_COMMANDS);
         onCreate(db);
     }
-
 }

src/main/java/com/infinario/android/infinariosdk/DbQueue.java

@@ -4,9 +4,7 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabaseLockedException;
 import android.text.TextUtils;
-import android.util.Log;
 
 import org.json.JSONException;
 
@@ -24,8 +22,8 @@ public class DbQueue {
     private Object lockAccess;
     private int openCounter;
 
-    public DbQueue(Context context) {
-        dbHelper = new DbHelper(context);
+    public DbQueue(Context context, String dbName) {
+        dbHelper = new DbHelper(context, dbName);
         lockAccess = new Object();
         openCounter = 0;
     }

src/main/java/com/infinario/android/infinariosdk/GcmIntentService.java

@@ -12,4 +12,4 @@ public GcmIntentService() {
     protected void onHandleIntent(Intent intent) {
         Infinario.handleGooglePushNotification(this, intent);
     }
-}
+}

src/main/java/com/infinario/android/infinariosdk/IabHelper.java

@@ -27,8 +27,6 @@
 
 import org.json.JSONException;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;