archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Roll back opencrx changes that aren't required, move opencrx packages to Astrid prefix.

Browse Source
pull/14/head
Tim Su 13 years ago
parent b5b6294972
commit 052c92d3a4
13 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -11,4 +11,4 @@ release
dev
lp-translations/
translations/strings.xml
keys

8
api/src/com/todoroo/andlib/service/DependencyInjectionService.java
Unescape Escape View File

@ -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(),
});
}
}

3
astrid/.classpath
Unescape Escape View File

@ -16,8 +16,7 @@
<classpathentry exported="true" kind="lib" path="libs/todoroo-g.jar"/>
<classpathentry kind="lib" path="libs/framework.jar"/>
<classpathentry kind="src" path="GreenDroid_src"/>
<classpathentry kind="src" path="facebook_src"/>
<classpathentry kind="src" path="astridApi_src"/>
<classpathentry kind="src" path="facebook_android_src"/>
<classpathentry kind="src" path="facebook_src"/>
<classpathentry kind="output" path="ecbuild"/>
</classpath>

5
astrid/.project
Unescape Escape View File

@ -47,11 +47,6 @@
<type>2</type>
<locationURI>_android_astridApi_98e6a2cf/src</locationURI>
</link>
<link>
<name>facebook_android_src</name>
<type>2</type>
<locationURI>_android_facebook_android_1d8d51f6/src</locationURI>
</link>
<link>
<name>facebook_src</name>
<type>2</type>

4
astrid/AndroidManifest.xml
Unescape Escape View File

@ -533,8 +533,8 @@
<action android:name="com.todoroo.astrid.REQUEST_SYNC_ACTIONS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</receiver>
</receiver>
<!-- other task actions -->
<receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
<intent-filter>

2
astrid/astrid.launch
Unescape Escape View File

@ -16,11 +16,9 @@
<booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/astrid"/>
<listEntry value="/astrid/AndroidManifest.xml"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>

1
astrid/default.properties
Unescape Escape View File

@ -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

2
astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxControlSet.java → astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
Unescape Escape View File

@ -1,4 +1,4 @@
package ru.otdelit.astrid.opencrx;
package com.todoroo.astrid.opencrx;
import java.util.ArrayList;

2
astrid/plugin-src/ru/otdelit/astrid/opencrx/OpencrxCoreUtils.java → astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
Unescape Escape View File

@ -1,4 +1,4 @@
package ru.otdelit.astrid.opencrx;
package com.todoroo.astrid.opencrx;
import android.content.Context;
import android.content.SharedPreferences;

10
astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -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;

15
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -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();
}

4
astrid/src/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -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;

4
astrid/src/com/todoroo/astrid/service/TaskService.java
Unescape Escape View File

@ -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;

Write Preview
Loading…
Cancel
Save