Add isMultiple tracking parameter

commons/src/main/java/org/wikimedia/commons/CommonsApplication.java

@@ -50,7 +50,7 @@ public class CommonsApplication extends Application {
     public static final String EVENTLOG_URL = "https://bits.wikimedia.org/event.gif";
     public static final String EVENTLOG_WIKI = "testwiki";
 
-    public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5257716L};
+    public static final Object[] EVENT_UPLOAD_ATTEMPT = {"MobileAppUploadAttempts", 5334329L};
     public static final Object[] EVENT_LOGIN_ATTEMPT = {"MobileAppLoginAttempts", 5257721L};
 
     public static final String DEFAULT_EDIT_SUMMARY = "Uploaded using Android Commons app";

commons/src/main/java/org/wikimedia/commons/MultipleShareActivity.java

@@ -218,6 +218,8 @@ public  class       MultipleShareActivity
                     up.setLocalUri(uri);
                     up.setTag("mimeType", intent.getType());
                     up.setTag("sequence", i);
+                    up.setSource(Contribution.SOURCE_EXTERNAL);
+                    up.setMultiple(true);
                     photosList.add(up);
                 }
             }

commons/src/main/java/org/wikimedia/commons/UploadService.java

@@ -220,6 +220,7 @@ public class UploadService extends HandlerService<Contribution> {
                 EventLog.schema(CommonsApplication.EVENT_UPLOAD_ATTEMPT)
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource())
+                        .param("multiple", contribution.getMultiple())
                         .param("result", errorCode)
                         .param("filename", contribution.getFilename())
                         .log();
@@ -238,6 +239,7 @@ public class UploadService extends HandlerService<Contribution> {
                         .param("username", app.getCurrentAccount().name)
                         .param("source", contribution.getSource()) //FIXME
                         .param("filename", contribution.getFilename())
+                        .param("multiple", contribution.getMultiple())
                         .param("result", "success")
                         .log();
             }

commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java

@@ -45,6 +45,16 @@ public class Contribution extends Media {
     private int state;
     private long transferred;
 
+    private boolean isMultiple;
+
+    public boolean getMultiple() {
+        return isMultiple;
+    }
+
+    public void setMultiple(boolean multiple) {
+        isMultiple = multiple;
+    }
+
     public EventLog.LogBuilder event;
 
 
@@ -56,6 +66,7 @@ public class Contribution extends Media {
         parcel.writeSerializable(timestamp);
         parcel.writeInt(state);
         parcel.writeLong(transferred);
+        parcel.writeInt(isMultiple ? 1 : 0);
     }
 
     public Contribution(Parcel in) {
@@ -65,6 +76,8 @@ public class Contribution extends Media {
         timestamp = (Date) in.readSerializable();
         state = in.readInt();
         transferred = in.readLong();
+        isMultiple = in.readInt() == 1;
+
     }
 
     public long getTransferred() {
@@ -165,6 +178,7 @@ public class Contribution extends Media {
         cv.put(Table.COLUMN_SOURCE,  source);
         cv.put(Table.COLUMN_DESCRIPTION, description);
         cv.put(Table.COLUMN_CREATOR, creator);
+        cv.put(Table.COLUMN_MULTIPLE, isMultiple ? 1 : 0);
         return cv;
     }
 
@@ -195,6 +209,7 @@ public class Contribution extends Media {
         c.source = cursor.getString(9);
         c.description = cursor.getString(10);
         c.creator = cursor.getString(11);
+        c.isMultiple = cursor.getInt(12) == 1;
         return c;
     }
 
@@ -226,6 +241,7 @@ public class Contribution extends Media {
         public static final String COLUMN_SOURCE = "source";
         public static final String COLUMN_DESCRIPTION = "description";
         public static final String COLUMN_CREATOR = "creator"; // Initial uploader
+        public static final String COLUMN_MULTIPLE = "multiple";
 
         // NOTE! KEEP IN SAME ORDER AS THEY ARE DEFINED UP THERE. HELPS HARD CODE COLUMN INDICES.
         public static final String[] ALL_FIELDS = {
@@ -240,7 +256,8 @@ public class Contribution extends Media {
                 COLUMN_TRANSFERRED,
                 COLUMN_SOURCE,
                 COLUMN_DESCRIPTION,
-                COLUMN_CREATOR
+                COLUMN_CREATOR,
+                COLUMN_MULTIPLE
         };
 
 
@@ -256,7 +273,8 @@ public class Contribution extends Media {
                 + "transferred INTEGER,"
                 + "source STRING,"
                 + "description STRING,"
-                + "creator STRING"
+                + "creator STRING,"
+                + "multiple INTEGER"
         + ");";
 
 
@@ -275,6 +293,9 @@ public class Contribution extends Media {
                 onUpdate(db, from, to);
                 return;
             }
+            if(from == 2) {
+                db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN multiple INTEGER;");
+            }
             db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
             onCreate(db);
         }

commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java

@@ -8,7 +8,7 @@ import org.wikimedia.commons.contributions.Contribution;
 public class DBOpenHelper  extends SQLiteOpenHelper{
 
     private static final String DATABASE_NAME = "commons.db";
-    private static final int DATABASE_VERSION = 2;
+    private static final int DATABASE_VERSION = 3;
 
     public DBOpenHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);