Merge pull request ankidroid#26 from iniju/v2.0.1-dev

Merge from iniju
GiuseppeR · Jan 20, 2013 · a0d08d3 · a0d08d3
2 parents fe831fa + c574949
commit a0d08d3
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/com/ichi2/async/DeckTask.java b/src/com/ichi2/async/DeckTask.java
@@ -817,15 +817,12 @@ private TaskData doInBackgroundImportAdd(TaskData... params) {
 				ankiDB.execute("ANALYZE");
 			}
 
-			// actualize counts
-			Object[] counts = null;
-			if (addedCount != -1) {
-				DeckTask.TaskData result = doInBackgroundLoadDeckCounts(new TaskData(col));
-				if (result != null) {
-					counts = result.getObjArray();
-				}			
-			}
-			return new TaskData(addedCount, counts, true);
+            // Update the counts
+            DeckTask.TaskData result = doInBackgroundLoadDeckCounts(new TaskData(col));
+            if (result == null) {
+                return null;
+            }
+            return new TaskData(addedCount, result.getObjArray(), true);
 		} catch (RuntimeException e) {
 			Log.e(AnkiDroidApp.TAG,
 					"doInBackgroundImportAdd - RuntimeException on importing cards: "
@@ -902,14 +899,13 @@ private TaskData doInBackgroundImportReplace(TaskData... params) {
 			}
 			// delete tmp dir
 			BackupManager.removeDir(dir);
-
-			// actualize counts
-			Object[] counts = null;
-			DeckTask.TaskData result = doInBackgroundLoadDeckCounts(new TaskData(col));
-			if (result != null) {
-				counts = result.getObjArray();
-			}			
-			return new TaskData(addedCount, counts, true);
+
+            // Update the counts
+            DeckTask.TaskData result = doInBackgroundLoadDeckCounts(new TaskData(col));
+            if (result == null) {
+                return null;
+            }
+            return new TaskData(addedCount, result.getObjArray(), true);
 		} catch (RuntimeException e) {
 			Log.e(AnkiDroidApp.TAG,
 					"doInBackgroundImportReplace - RuntimeException on reopening collection: "