Save temporary debug changes

pull/14/head
Sam Bosley 13 years ago
parent 6060424187
commit c1f0f36a17

@ -6,8 +6,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid" package="com.timsu.astrid"
android:versionName="4.3.4" android:versionName="4.4.0-beta"
android:versionCode="282"> android:versionCode="285">
<!-- widgets, alarms, and services will break if Astrid is installed on SD card --> <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
<!-- android:installLocation="internalOnly"> --> <!-- android:installLocation="internalOnly"> -->

@ -36,6 +36,7 @@ public class TagsTableMigrator {
MetadataCriteria.withKey(TagService.KEY), MetadataCriteria.withKey(TagService.KEY),
Criterion.not(TagService.TAG.in(Query.select(TagData.NAME).from(TagData.TABLE))))).groupBy(TagService.TAG); Criterion.not(TagService.TAG.in(Query.select(TagData.NAME).from(TagData.TABLE))))).groupBy(TagService.TAG);
System.err.println("QUERY1 " + noTagDataQuery.toString());
TodorooCursor<Metadata> noTagData = metadataService.query(noTagDataQuery); TodorooCursor<Metadata> noTagData = metadataService.query(noTagDataQuery);
try { try {
Metadata tag = new Metadata(); Metadata tag = new Metadata();
@ -57,6 +58,8 @@ public class TagsTableMigrator {
.join(Join.left(TagData.TABLE, .join(Join.left(TagData.TABLE,
Criterion.and(MetadataCriteria.withKey(TagService.KEY), TagService.TAG.eq(TagData.NAME)))); Criterion.and(MetadataCriteria.withKey(TagService.KEY), TagService.TAG.eq(TagData.NAME))));
System.err.println("QUERY2 " + joinedTagData.toString());
TodorooCursor<Metadata> allTagLinks = metadataService.query(joinedTagData); TodorooCursor<Metadata> allTagLinks = metadataService.query(joinedTagData);
try { try {
Metadata tag = new Metadata(); Metadata tag = new Metadata();

@ -147,6 +147,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
ThemeService.applyTheme(this); ThemeService.applyTheme(this);
AndroidUtilities.copyDatabases(this, "/sdcard/databases");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

@ -47,6 +47,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
public final class UpgradeService { public final class UpgradeService {
public static final int V4_4_0 = 285;
public static final int V4_3_4 = 282; public static final int V4_3_4 = 282;
public static final int V4_3_3 = 281; public static final int V4_3_3 = 281;
public static final int V4_3_2 = 280; public static final int V4_3_2 = 280;

Loading…
Cancel
Save