diff --git a/.gitignore b/.gitignore
index 0c6719fca..7625933ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@ release
dev
lp-translations/
translations/strings.xml
-keys
+
diff --git a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
index f842d86ea..3c4e2ebe5 100644
--- a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
+++ b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
@@ -3,6 +3,9 @@ package com.todoroo.andlib.service;
import java.lang.reflect.Field;
import java.util.LinkedList;
+import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter;
+import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
+
/**
@@ -72,8 +75,6 @@ public class DependencyInjectionService {
return true;
if(packageName.startsWith("org.weloveastrid"))
return true;
- if(packageName.startsWith("ru.otdelit"))
- return true;
return false;
}
@@ -124,6 +125,9 @@ public class DependencyInjectionService {
protected void addInjectables() {
injectables.put("debug", false);
injectables.put("exceptionService", ExceptionService.class);
+ injectables.put("errorReporters", new ErrorReporter[] {
+ new AndroidLogReporter(),
+ });
}
}
diff --git a/astrid/.classpath b/astrid/.classpath
index 404a2b106..5e1a35c02 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -16,8 +16,7 @@
-
-
+
diff --git a/astrid/.project b/astrid/.project
index cf33b0731..7955497d1 100644
--- a/astrid/.project
+++ b/astrid/.project
@@ -47,11 +47,6 @@
2
_android_astridApi_98e6a2cf/src
-
- facebook_android_src
- 2
- _android_facebook_android_1d8d51f6/src
-
facebook_src
2
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index d9b76941a..1ea6e9aaa 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -533,8 +533,8 @@
-
-
+
+
diff --git a/astrid/astrid.launch b/astrid/astrid.launch
index 3a3c34a50..fc989823f 100644
--- a/astrid/astrid.launch
+++ b/astrid/astrid.launch
@@ -16,11 +16,9 @@
-
-
diff --git a/astrid/default.properties b/astrid/default.properties
index 6e01a4ec2..0537306e2 100644
--- a/astrid/default.properties
+++ b/astrid/default.properties
@@ -15,4 +15,3 @@ target=android-8
apk-configurations=
android.library.reference.2=../greendroid/GreenDroid/
android.library.reference.3=../facebook/facebook/
-android.library.reference.4=../../astrid-opencrx
diff --git a/astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxControlSet.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
similarity index 99%
rename from astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxControlSet.java
rename to astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
index 359747347..61db47853 100644
--- a/astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
@@ -1,4 +1,4 @@
-package ru.otdelit.astrid.opencrx;
+package com.todoroo.astrid.opencrx;
import java.util.ArrayList;
diff --git a/astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxCoreUtils.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
similarity index 99%
rename from astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxCoreUtils.java
rename to astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
index 4ab9de46f..0d00b831f 100644
--- a/astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxCoreUtils.java
+++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
@@ -1,4 +1,4 @@
-package ru.otdelit.astrid.opencrx;
+package com.todoroo.astrid.opencrx;
import android.content.Context;
import android.content.SharedPreferences;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 7e4c17575..c4c3a4100 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -26,18 +26,16 @@ import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import ru.otdelit.astrid.opencrx.OpencrxControlSet;
-import ru.otdelit.astrid.opencrx.OpencrxCoreUtils;
import android.app.AlertDialog;
import android.app.TabActivity;
import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnDismissListener;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
@@ -50,6 +48,7 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CheckBox;
@@ -64,7 +63,6 @@ import android.widget.TextView;
import android.widget.TimePicker;
import android.widget.Toast;
import android.widget.ToggleButton;
-import android.widget.AdapterView.OnItemSelectedListener;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property.StringProperty;
@@ -78,6 +76,8 @@ import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gcal.GCalControlSet;
+import com.todoroo.astrid.opencrx.OpencrxControlSet;
+import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
import com.todoroo.astrid.producteev.ProducteevControlSet;
import com.todoroo.astrid.producteev.ProducteevUtilities;
import com.todoroo.astrid.reminders.Notifications;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 930b592c3..1e4d225b7 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -3,9 +3,9 @@ package com.todoroo.astrid.activity;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Map.Entry;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicReference;
import org.weloveastrid.rmilk.MilkPreferences;
@@ -32,28 +32,28 @@ import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
import android.view.inputmethod.EditorInfo;
import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property;
@@ -180,6 +180,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
/* ======================================================================
* ======================================================= initialization
* ====================================================================== */
+
static {
AstridDependencyInjector.initialize();
}
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 754dd515c..30436041e 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.weloveastrid.rmilk.MilkUtilities;
-import ru.otdelit.astrid.opencrx.OpencrxCoreUtils;
import android.Manifest;
import android.app.Activity;
import android.app.AlarmManager;
@@ -13,8 +12,8 @@ import android.app.AlertDialog;
import android.app.PendingIntent;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.Intent;
import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
@@ -36,6 +35,7 @@ import com.todoroo.astrid.backup.BackupService;
import com.todoroo.astrid.backup.TasksXmlImporter;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
import com.todoroo.astrid.producteev.ProducteevUtilities;
import com.todoroo.astrid.reminders.ReminderStartupReceiver;
import com.todoroo.astrid.utility.AstridPreferences;
diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java
index 68737599f..8f3af2934 100644
--- a/astrid/src/com/todoroo/astrid/service/TaskService.java
+++ b/astrid/src/com/todoroo/astrid/service/TaskService.java
@@ -6,7 +6,6 @@ import java.util.regex.Pattern;
import org.weloveastrid.rmilk.data.MilkTaskFields;
-import ru.otdelit.astrid.opencrx.OpencrxCoreUtils;
import android.content.ContentValues;
import com.todoroo.andlib.data.Property;
@@ -20,12 +19,13 @@ import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.dao.MetadataDao;
-import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
+import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksMetadata;
+import com.todoroo.astrid.opencrx.OpencrxCoreUtils;
import com.todoroo.astrid.producteev.ProducteevUtilities;
import com.todoroo.astrid.producteev.sync.ProducteevTask;
import com.todoroo.astrid.tags.TagService;