From 79f6185f8c7a245f18af080c9b5a425f8499b2b6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 23 Apr 2013 10:27:46 -0700
Subject: [PATCH] Add DB updaters for Category table

---
 .../java/org/wikimedia/commons/category/Category.java  | 10 ++++++++++
 .../wikimedia/commons/contributions/Contribution.java  |  5 +++++
 .../java/org/wikimedia/commons/data/DBOpenHelper.java  |  5 ++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/commons/src/main/java/org/wikimedia/commons/category/Category.java b/commons/src/main/java/org/wikimedia/commons/category/Category.java
index f7ff437ed..33609962b 100644
--- a/commons/src/main/java/org/wikimedia/commons/category/Category.java
+++ b/commons/src/main/java/org/wikimedia/commons/category/Category.java
@@ -127,6 +127,16 @@ public class Category {
             if(from == to) {
                 return;
             }
+            if(from < 4) {
+                // doesn't exist yet
+                from++;
+                onUpdate(db, from, to);
+                return;
+            }
+            if(from == 4) {
+                // table added in version 5
+                onCreate(db);
+            }
         }
     }
 }
diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
index 81892ac48..ece2719b6 100644
--- a/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
+++ b/commons/src/main/java/org/wikimedia/commons/contributions/Contribution.java
@@ -302,6 +302,11 @@ public class Contribution extends Media {
                 from++;
                 return;
             }
+            if(from == 4) {
+                // Do nothing -- added Category
+                from++;
+                return;
+            }
         }
     }
 }
diff --git a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
index 011baa429..4430ac59a 100644
--- a/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
+++ b/commons/src/main/java/org/wikimedia/commons/data/DBOpenHelper.java
@@ -3,13 +3,14 @@ package org.wikimedia.commons.data;
 import android.content.*;
 import android.database.sqlite.*;
 
+import org.wikimedia.commons.category.Category;
 import org.wikimedia.commons.contributions.*;
 import org.wikimedia.commons.modifications.ModifierSequence;
 
 public class DBOpenHelper  extends SQLiteOpenHelper{
 
     private static final String DATABASE_NAME = "commons.db";
-    private static final int DATABASE_VERSION = 4;
+    private static final int DATABASE_VERSION = 5;
 
     public DBOpenHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -19,11 +20,13 @@ public class DBOpenHelper  extends SQLiteOpenHelper{
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
         Contribution.Table.onCreate(sqLiteDatabase);
         ModifierSequence.Table.onCreate(sqLiteDatabase);
+        Category.Table.onCreate(sqLiteDatabase);
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int from, int to) {
         Contribution.Table.onUpdate(sqLiteDatabase, from, to);
         ModifierSequence.Table.onUpdate(sqLiteDatabase, from, to);
+        Category.Table.onUpdate(sqLiteDatabase, from, to);
     }
 }