Cleaned up a bunch of warnings, fixed a few small issues, code and formatting cleanup

pull/14/head
Tim Su 13 years ago
parent e70d7e4cca
commit c34c1df463

@ -163,7 +163,6 @@ import android.util.Log;
/*
* Suppress JavaDoc warnings because the {@link android.os.Build#SERIAL} fails when built with SDK 4.
*/
@SuppressWarnings("javadoc")
public static String getSerialNumberHashOrNull()
{
/*

@ -562,6 +562,7 @@ public final class LocalyticsSession
* @throws IllegalArgumentException if {@code steps} is null.
* @throws IllegalArgumentException if {@code steps} has length 0.
*/
@SuppressWarnings("nls")
public static String createRangedAttribute(final int actualValue, final int[] steps)
{
if (null == steps)

@ -15,8 +15,9 @@ import com.mdimension.jchronic.tags.TimeZone;
import com.mdimension.jchronic.utils.Span;
import com.mdimension.jchronic.utils.Token;
@SuppressWarnings("nls")
public class AstridChronic {
public static final String VERSION = "0.2.3";
public static final String VERSION = "0.2.3";
private AstridChronic() {
// DO NOTHING

@ -106,8 +106,6 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
public static final String SHOW_TOAST = "show_toast"; //$NON-NLS-1$
private boolean showToast;
// --- ui initialization
private static final int REQUEST_CODE_GOOGLE_ACCOUNTS = 1;
@ -147,7 +145,6 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
rand = new Random(DateUtilities.now());
noSync = getIntent().getBooleanExtra(EXTRA_DO_NOT_SYNC, false);
showToast = getIntent().getBooleanExtra(SHOW_TOAST, true);
initializeUI();

@ -49,7 +49,7 @@ import com.todoroo.astrid.welcome.HelpInfoPopover;
public class TagSettingsActivity extends FragmentActivity {
public static final String TOKEN_NEW_FILTER = "newFilter";
public static final String TOKEN_NEW_FILTER = "newFilter"; //$NON-NLS-1$
private static final int MENU_SAVE_ID = R.string.TEA_menu_save;
private static final int MENU_DISCARD_ID = R.string.TEA_menu_discard;

@ -230,8 +230,8 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
// mass update the CALENDAR_URI here,
// since the GCalHelper doesnt save it due to performance-reasons
Task template = new Task();
template.setValue(Task.CALENDAR_URI, "");
int result = taskService.update(
template.setValue(Task.CALENDAR_URI, ""); //$NON-NLS-1$
taskService.update(
Criterion.and(Task.COMPLETION_DATE.gt(0), Task.CALENDAR_URI.isNotNull()),
template);
showResult(R.string.EPr_manage_delete_completed_gcal_status, deletedEventCount);
@ -271,8 +271,8 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
// mass update the CALENDAR_URI here,
// since the GCalHelper doesnt save it due to performance-reasons
Task template = new Task();
template.setValue(Task.CALENDAR_URI, "");
int result = taskService.update(
template.setValue(Task.CALENDAR_URI, ""); //$NON-NLS-1$
taskService.update(
Task.CALENDAR_URI.isNotNull(),
template);
showResult(R.string.EPr_manage_delete_all_gcal_status, deletedEventCount);

@ -372,7 +372,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
callback = existingCallback;
else {
callback = new ProgressBarSyncResultCallback(
((Activity)getContext()), (ProgressBar)parentView.findViewById(R.id.progressBar), R.id.progressBar, new Runnable() {
((Activity)getContext()), (ProgressBar)parentView.findViewById(R.id.progressBar), new Runnable() {
@Override
public void run() {
setUpListAdapter();

@ -329,8 +329,11 @@
<!-- Toast: task was not saved -->
<string name="TEA_onTaskCancel">Task Editing Was Canceled</string>
<!-- Toast: task was deleted -->
<string name="TEA_onTaskDelete">Task Deleted!</string>
<!-- Task edit tab: activity -->
<string name="TEA_tab_activity">Activity</string>
<!-- Task edit tab: more editing settings -->
<string name="TEA_tab_more">More</string>
<string-array name="TEA_urgency">
<!-- urgency: labels for edit page. item #4 -> auto filled -->

@ -31,7 +31,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
/** Abstract controller class. Mostly contains some static fields */
@SuppressWarnings("nls")
abstract public class AbstractController {
abstract public class LegacyAbstractController {
protected Context context;
@ -57,7 +57,7 @@ abstract public class AbstractController {
// stuff
public AbstractController(Context context) {
public LegacyAbstractController(Context context) {
this.context = context;
DependencyInjectionService.getInstance().inject(this);
}
@ -67,7 +67,7 @@ abstract public class AbstractController {
// cursor iterator
public static class CursorIterator<TYPE extends AbstractModel> implements Iterator<TYPE> {
public static class CursorIterator<TYPE extends LegacyAbstractModel> implements Iterator<TYPE> {
Cursor cursor;
Class<TYPE> cls;

@ -27,7 +27,7 @@ import android.database.Cursor;
/** A data object backed by a database */
@SuppressWarnings("nls")
public abstract class AbstractModel {
public abstract class LegacyAbstractModel {
/* Data Source Ordering:
*
@ -49,12 +49,12 @@ public abstract class AbstractModel {
// --- constructors
/** Construct a model from scratch */
public AbstractModel() {
public LegacyAbstractModel() {
// ...
}
/** Construct a model from a database object */
public AbstractModel(Cursor cursor) {
public LegacyAbstractModel(Cursor cursor) {
this.cursor = cursor;
}

@ -28,14 +28,14 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.LegacyAbstractModel;
import com.timsu.astrid.data.task.TaskIdentifier;
/** A single alert on a task */
@SuppressWarnings("nls")
public class Alert extends AbstractModel {
public class Alert extends LegacyAbstractModel {
/** Version number of this model */
static final int VERSION = 1;
@ -54,7 +54,7 @@ public class Alert extends AbstractModel {
}
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
TASK,
DATE,
};
@ -76,7 +76,7 @@ public class Alert extends AbstractModel {
public synchronized void onCreate(SQLiteDatabase db) {
String sql = new StringBuilder().
append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
append(AbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(TASK).append(" integer not null,").
append(DATE).append(" integer not null,").
append("unique (").append(TASK).append(",").append(DATE).append(")").

@ -31,13 +31,13 @@ import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.alerts.Alert.AlertDatabaseHelper;
import com.timsu.astrid.data.task.TaskIdentifier;
/** Controller for Tag-related operations */
@SuppressWarnings("nls")
public class AlertController extends AbstractController {
public class AlertController extends LegacyAbstractController {
private SQLiteDatabase alertDatabase;

@ -28,7 +28,7 @@ import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.sync.SyncMapping.SyncMappingDatabaseHelper;
import com.timsu.astrid.data.task.AbstractTaskModel;
import com.timsu.astrid.data.task.TaskIdentifier;
@ -36,7 +36,7 @@ import com.timsu.astrid.data.task.TaskModelForSync;
/** Controller for Tag-related operations */
@SuppressWarnings("nls")
public class SyncDataController extends AbstractController {
public class SyncDataController extends LegacyAbstractController {
private SQLiteDatabase syncDatabase;

@ -26,14 +26,14 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.LegacyAbstractModel;
import com.timsu.astrid.data.task.TaskIdentifier;
/** A single tag on a task */
@SuppressWarnings("nls")
public class SyncMapping extends AbstractModel {
public class SyncMapping extends LegacyAbstractModel {
/** Version number of this model */
@ -58,7 +58,7 @@ public class SyncMapping extends AbstractModel {
}
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
TASK,
SYNC_SERVICE,
REMOTE_ID,
@ -82,7 +82,7 @@ public class SyncMapping extends AbstractModel {
public synchronized void onCreate(SQLiteDatabase db) {
String sql = new StringBuilder().
append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
append(AbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(TASK).append(" integer not null,").
append(SYNC_SERVICE).append(" integer not null,").
append(REMOTE_ID).append(" text not null,").
@ -132,12 +132,12 @@ public class SyncMapping extends AbstractModel {
// --- getters and setters
public void setId(long id) {
putIfChangedFromDatabase(AbstractController.KEY_ROWID, id);
putIfChangedFromDatabase(LegacyAbstractController.KEY_ROWID, id);
}
public long getId() {
try {
return retrieveLong(AbstractController.KEY_ROWID);
return retrieveLong(LegacyAbstractController.KEY_ROWID);
} catch (UnsupportedOperationException e) {
return 0;
}

@ -28,8 +28,8 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.LegacyAbstractModel;
/** Abstract model of a task. Subclasses implement the getters and setters
@ -39,7 +39,7 @@ import com.timsu.astrid.data.AbstractModel;
*
*/
@SuppressWarnings("nls")
public abstract class AbstractTagModel extends AbstractModel {
public abstract class AbstractTagModel extends LegacyAbstractModel {
/** Version number of this model */
static final int VERSION = 1;
@ -94,7 +94,7 @@ public abstract class AbstractTagModel extends AbstractModel {
public synchronized void onCreate(SQLiteDatabase db) {
String sql = new StringBuilder().
append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
append(AbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(NAME).append(" text unique,").
append(NOTES).append(" text,").
append(ICON).append(" integer,").
@ -147,7 +147,7 @@ public abstract class AbstractTagModel extends AbstractModel {
AbstractTagModel(Cursor cursor) {
super(cursor);
Integer id = retrieveInteger(AbstractController.KEY_ROWID);
Integer id = retrieveInteger(LegacyAbstractController.KEY_ROWID);
setTagIdentifier(new TagIdentifier(id));
}

@ -29,7 +29,7 @@ import android.database.Cursor;
import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.tag.AbstractTagModel.TagModelDatabaseHelper;
import com.timsu.astrid.data.tag.TagToTaskMapping.TagToTaskMappingDatabaseHelper;
import com.timsu.astrid.data.task.AbstractTaskModel.TaskModelDatabaseHelper;
@ -39,7 +39,7 @@ import com.todoroo.astrid.provider.Astrid2TaskProvider;
/** Controller for Tag-related operations */
@SuppressWarnings("nls")
@Deprecated
public class TagController extends AbstractController {
public class TagController extends LegacyAbstractController {
private SQLiteDatabase tagDatabase, tagToTaskMapDatabase;

@ -21,7 +21,7 @@ package com.timsu.astrid.data.tag;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
/** Tag model for viewing purposes. Contains task name */
@ -29,7 +29,7 @@ import com.timsu.astrid.data.AbstractController;
public class TagModelForView extends AbstractTagModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
};

@ -26,14 +26,14 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.LegacyAbstractModel;
import com.timsu.astrid.data.task.TaskIdentifier;
/** A single tag on a task */
@SuppressWarnings("nls")
public class TagToTaskMapping extends AbstractModel {
public class TagToTaskMapping extends LegacyAbstractModel {
/** Version number of this model */
static final int VERSION = 2;
@ -52,7 +52,7 @@ public class TagToTaskMapping extends AbstractModel {
}
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
TASK,
TAG,
};
@ -74,7 +74,7 @@ public class TagToTaskMapping extends AbstractModel {
public synchronized void onCreate(SQLiteDatabase db) {
String sql = new StringBuilder().
append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
append(AbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(TASK).append(" integer not null,").
append(TAG).append(" integer not null,").
append("unique (").append(TASK).append(",").append(TAG).append(")").

@ -29,8 +29,8 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
import com.timsu.astrid.R;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.LegacyAbstractModel;
import com.timsu.astrid.data.enums.Importance;
import com.timsu.astrid.data.enums.RepeatInterval;
@ -42,7 +42,7 @@ import com.timsu.astrid.data.enums.RepeatInterval;
*
*/
@SuppressWarnings("nls")
public abstract class AbstractTaskModel extends AbstractModel {
public abstract class AbstractTaskModel extends LegacyAbstractModel {
/** Version number of this model */
static final int VERSION = 8;
@ -128,7 +128,7 @@ public abstract class AbstractTaskModel extends AbstractModel {
public synchronized void onCreate(SQLiteDatabase db) {
String sql = new StringBuilder().
append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
append(AbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
append(NAME).append(" text not null,").
append(NOTES).append(" text not null,").
append(PROGRESS_PERCENTAGE).append(" integer not null,").
@ -403,7 +403,7 @@ public abstract class AbstractTaskModel extends AbstractModel {
AbstractTaskModel(Cursor cursor) {
super(cursor);
Integer id = retrieveInteger(AbstractController.KEY_ROWID);
Integer id = retrieveInteger(LegacyAbstractController.KEY_ROWID);
setTaskIdentifier(new TaskIdentifier(id));
}

@ -36,7 +36,7 @@ import android.database.sqlite.SQLiteOpenHelper;
import android.net.Uri;
import android.util.Log;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.alerts.AlertController;
import com.timsu.astrid.data.sync.SyncDataController;
import com.timsu.astrid.data.task.AbstractTaskModel.RepeatInfo;
@ -52,7 +52,7 @@ import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService;
*/
@Deprecated
@SuppressWarnings("nls")
public class TaskController extends AbstractController {
public class TaskController extends LegacyAbstractController {
private SQLiteDatabase database;

@ -26,7 +26,7 @@ import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.alerts.AlertController;
@ -36,7 +36,7 @@ import com.timsu.astrid.data.alerts.AlertController;
public class TaskModelForHandlers extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
REPEAT,
DEFINITE_DUE_DATE,
PREFERRED_DUE_DATE,

@ -25,7 +25,7 @@ import java.util.HashMap;
import android.content.Context;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.enums.Importance;
@ -34,7 +34,7 @@ import com.timsu.astrid.data.enums.Importance;
public class TaskModelForList extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
ELAPSED_SECONDS,

@ -23,7 +23,7 @@ import java.util.Date;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
@ -31,7 +31,7 @@ import com.timsu.astrid.data.AbstractController;
public class TaskModelForNotify extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
ESTIMATED_SECONDS,
NOTIFICATIONS,
NOTIFICATION_FLAGS,

@ -24,7 +24,7 @@ import java.util.Date;
import android.content.ContentValues;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.enums.Importance;
@ -34,7 +34,7 @@ import com.timsu.astrid.data.enums.Importance;
public class TaskModelForProvider extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
PREFERRED_DUE_DATE,

@ -23,7 +23,7 @@ import java.util.Date;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
@ -31,7 +31,7 @@ import com.timsu.astrid.data.AbstractController;
public class TaskModelForReminder extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
NOTIFICATION_FLAGS,
HIDDEN_UNTIL,

@ -23,7 +23,7 @@ import java.util.Date;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.enums.Importance;
@ -32,7 +32,7 @@ import com.timsu.astrid.data.enums.Importance;
public class TaskModelForSync extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
ESTIMATED_SECONDS,

@ -23,7 +23,7 @@ import java.util.Date;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.enums.Importance;
@ -33,7 +33,7 @@ import com.timsu.astrid.data.enums.Importance;
public class TaskModelForWidget extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
PREFERRED_DUE_DATE,

@ -5,7 +5,7 @@ import java.util.HashMap;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.LegacyAbstractController;
import com.timsu.astrid.data.enums.Importance;
import com.timsu.astrid.data.enums.RepeatInterval;
import com.todoroo.astrid.backup.BackupDateUtilities;
@ -14,7 +14,7 @@ import com.todoroo.astrid.backup.BackupDateUtilities;
public class TaskModelForXml extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
LegacyAbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
ELAPSED_SECONDS,
@ -77,7 +77,7 @@ public class TaskModelForXml extends AbstractTaskModel {
/* Build a HashMap of task fields and associated values.
*/
public HashMap<String, String> getTaskAttributes() {
taskAttributesMap.put(AbstractController.KEY_ROWID, getTaskIdentifier().idAsString());
taskAttributesMap.put(LegacyAbstractController.KEY_ROWID, getTaskIdentifier().idAsString());
taskAttributesMap.put(NAME, getName());
taskAttributesMap.put(IMPORTANCE, getImportance().toString());
taskAttributesMap.put(ELAPSED_SECONDS, getElapsedSeconds().toString());

@ -23,6 +23,13 @@ import com.todoroo.astrid.data.AddOn;
import com.todoroo.astrid.service.AddOnService;
import com.todoroo.astrid.service.AstridDependencyInjector;
/**
* TODO: fix deprecation or get rid of me
*
* @author Tim Su <tim@todoroo.com>
*
*/
@SuppressWarnings("deprecation")
public class AddOnActivity extends TabActivity {
/** boolean: whether to start on available page */

@ -171,7 +171,6 @@ public class BeastModePreferences extends ListActivity {
private void resetToDefault() {
String[] prefsArray = getResources().getStringArray(R.array.TEA_control_sets_prefs);
String[] descriptionsArray = getResources().getStringArray(R.array.TEA_control_sets);
while (items.size() > 0)
items.remove(0);
for (String s : prefsArray)

@ -3,8 +3,6 @@ package com.todoroo.astrid.activity;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.Fragment;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@ -19,6 +17,7 @@ import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
@SuppressWarnings("nls")
public class ExpandableListFragment extends Fragment
implements OnCreateContextMenuListener,
ExpandableListView.OnChildClickListener, ExpandableListView.OnGroupCollapseListener,
@ -50,9 +49,6 @@ public class ExpandableListFragment extends Fragment
boolean mListShown;
boolean mFinishedStart = false;
public ExpandableListFragment() {
}
/**
* Provide default implementation to return a simple list view. Subclasses
* can override to replace with their own layout. If doing so, the
@ -122,6 +118,7 @@ public class ExpandableListFragment extends Fragment
* @param id The row id of the item that was clicked
*/
public void onListItemClick(ListView l, View v, int position, long id) {
// override me
}
/**
@ -318,29 +315,6 @@ public class ExpandableListFragment extends Fragment
mHandler.post(mRequestFocus);
}
@Override
public void onGroupExpand(int arg0) {
// TODO Auto-generated method stub
}
@Override
public void onGroupCollapse(int arg0) {
// TODO Auto-generated method stub
}
@Override
public boolean onChildClick(ExpandableListView arg0, View arg1, int arg2,
int arg3, long arg4) {
// TODO Auto-generated method stub
return false;
}
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
}
public void onContentChanged() {
View emptyView = getView().findViewById(android.R.id.empty);
mList = (ExpandableListView)getView().findViewById(android.R.id.list);
@ -361,4 +335,20 @@ public class ExpandableListFragment extends Fragment
}
mFinishedStart = true;
}
@Override
public void onGroupExpand(int groupPosition) {
// override me
}
@Override
public void onGroupCollapse(int groupPosition) {
// override me
}
@Override
public boolean onChildClick(ExpandableListView parent, View v,
int groupPosition, int childPosition, long id) {
return false;
}
}

@ -66,9 +66,9 @@ import com.todoroo.astrid.tags.TagsPlugin;
*/
public class FilterListFragment extends ListFragment {
public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment";
public static final String TAG_FILTERLIST_FRAGMENT = "filterlist_fragment"; //$NON-NLS-1$
public static final String TOKEN_LAST_SELECTED = "lastSelected";
public static final String TOKEN_LAST_SELECTED = "lastSelected"; //$NON-NLS-1$
// -- extra codes
//public static final String SHOW_BACK_BUTTON = "show_back"; //$NON-NLS-1$
@ -185,8 +185,7 @@ public class FilterListFragment extends ListFragment {
});
AstridActivity activity = (AstridActivity) getActivity();
mDualFragments = activity.isMultipleFragments();
if (mDualFragments)
if (activity.getFragmentLayout() > AstridActivity.LAYOUT_SINGLE)
mSelectedIndex = activity.getIntent().getIntExtra(TOKEN_LAST_SELECTED, 0);
onNewIntent(activity.getIntent());
@ -236,13 +235,9 @@ public class FilterListFragment extends ListFragment {
item = menu.add(Menu.NONE, MENU_SEARCH_ID, Menu.NONE,
R.string.FLA_menu_search);
item.setIcon(android.R.drawable.ic_menu_search);
if (((AstridActivity) getActivity()).isMultipleFragments())
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
// item = menu.add(Menu.NONE, MENU_HELP_ID, 1,
// R.string.FLA_menu_help);
// item.setIcon(android.R.drawable.ic_menu_help);
if (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE)
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
/* ======================================================================
@ -430,10 +425,6 @@ public class FilterListFragment extends ListFragment {
startActivityForResult(intent, REQUEST_CUSTOM_INTENT);
return true;
}
case android.R.id.home: {
// TODO: maybe invoke a dashboard later
return true;
}
default: {
Fragment tasklist = getSupportFragmentManager().findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT);
if (tasklist != null && tasklist.isInLayout())

@ -6,19 +6,21 @@ import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.View;
import com.timsu.astrid.R;
import com.viewpagerindicator.TitleProvider;
public class TaskEditViewPager extends PagerAdapter implements TitleProvider {
private static String[] titles = new String[] { "Activity", "More" };
private final Context context;
private static String[] titles;
public TaskEditFragment parent;
public TaskEditViewPager(Context context) {
this.context = context;
titles = new String[] {
context.getString(R.string.TEA_tab_activity),
context.getString(R.string.TEA_tab_more),
};
}
@Override
public int getCount() {
return titles.length;
@ -47,12 +49,6 @@ public class TaskEditViewPager extends PagerAdapter implements TitleProvider {
return titles[position];
}
@Override
public void finishUpdate(View view) {
//System.err.println("UpdateView");
}
@Override
public Parcelable saveState() {
return null;

@ -32,7 +32,7 @@ import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
public class TaskListActivity extends AstridActivity implements MainMenuListener {
public static final String TOKEN_SELECTED_FILTER = "selectedFilter";
public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$
private View listsNav;
private ImageView listsNavDisclosure;
private TextView lists;

@ -402,7 +402,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
MenuItem item = menu.add(Menu.NONE, MENU_SYNC_ID, Menu.NONE,
R.string.TLA_menu_sync);
item.setIcon(R.drawable.ic_menu_refresh);
if (((AstridActivity) getActivity()).isMultipleFragments())
if (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE)
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
@ -422,7 +422,7 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
item = menu.add(Menu.NONE, MENU_SORT_ID, Menu.NONE,
R.string.TLA_menu_sort);
item.setIcon(android.R.drawable.ic_menu_sort_by_size);
if (((AstridActivity) getActivity()).isMultipleFragments())
if (((AstridActivity) getActivity()).getFragmentLayout() != AstridActivity.LAYOUT_SINGLE)
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
}
@ -803,8 +803,6 @@ public class TaskListFragment extends ListFragment implements OnScrollListener,
}
public void onWindowFocusChanged(boolean hasFocus) {
// FIXME: move to parent Activity
// super.onWindowFocusChanged(hasFocus);
if (hasFocus && Flags.checkAndClear(Flags.REFRESH)) {
taskAdapter.flushCaches();
loadTaskListContent(true);

@ -204,7 +204,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
convertView = newView(convertView, parent);
ViewHolder viewHolder = (ViewHolder) convertView.getTag();
viewHolder.item = (FilterListItem) getItem(position);
populateView(viewHolder, false);
populateView(viewHolder);
if (listView.isItemChecked(position)) {
convertView.setBackgroundColor(activity.getResources().getColor(R.color.tablet_list_selected));
@ -398,7 +398,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
* ================================================================ views
* ====================================================================== */
public void populateView(ViewHolder viewHolder, boolean isExpanded) {
public void populateView(ViewHolder viewHolder) {
FilterListItem filter = viewHolder.item;
if(filter == null)
return;

@ -39,8 +39,9 @@ import android.util.Log;
* @param <V> the value that will be stored to disk
*/
// TODO add automatic cache cleanup so low disk conditions can be met
@SuppressWarnings("nls")
public abstract class DiskCache<K, V> {
private static final String TAG = "DiskCache";
private static final String TAG = "DiskCache";
private MessageDigest hash;

@ -16,16 +16,10 @@ package com.todoroo.astrid.helper;
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.http.client.ClientProtocolException;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
import android.graphics.BitmapFactory;
@ -48,6 +42,7 @@ import android.util.Log;
* @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
*
*/
@SuppressWarnings("nls")
public class ImageCache extends DiskCache<String, Bitmap> {
private static final String TAG = ImageCache.class.getSimpleName();
@ -62,8 +57,6 @@ public class ImageCache extends DiskCache<String, Bitmap> {
private final CompressFormat mCompressFormat;
private final int mQuality;
private final Resources mRes;
// TODO make it so this is customizable on the instance level.
/**
* Gets an instance of the cache.
@ -80,7 +73,6 @@ public class ImageCache extends DiskCache<String, Bitmap> {
private ImageCache(Context context, CompressFormat format, int quality) {
super(context.getCacheDir(), null, getExtension(format));
mRes = context.getResources();
mCompressFormat = format;
mQuality = quality;
@ -184,66 +176,4 @@ public class ImageCache extends DiskCache<String, Bitmap> {
// TODO actually make it possible to cancel tasks
}
/**
* Blocking call to scale a local file. Scales using preserving aspect ratio
*
* @param localFile
* local image file to be scaled
* @param width
* maximum width
* @param height
* maximum height
* @return the scaled image
* @throws ClientProtocolException
* @throws IOException
*/
private static Bitmap scaleLocalImage(File localFile, int width, int height)
throws ClientProtocolException, IOException {
if (DEBUG){
Log.d(TAG, "scaleLocalImage(" + localFile + ", "+ width +", "+ height + ")");
}
if (!localFile.exists()) {
throw new IOException("local file does not exist: " + localFile);
}
if (!localFile.canRead()) {
throw new IOException("cannot read from local file: " + localFile);
}
// the below borrowed from:
// https://github.com/thest1/LazyList/blob/master/src/com/fedorvlasov/lazylist/ImageLoader.java
// decode image size
final BitmapFactory.Options o = new BitmapFactory.Options();
o.inJustDecodeBounds = true;
BitmapFactory.decodeStream(new FileInputStream(localFile), null, o);
// Find the correct scale value. It should be the power of 2.
//final int REQUIRED_WIDTH = width, REQUIRED_HEIGHT = height;
int width_tmp = o.outWidth, height_tmp = o.outHeight;
int scale = 1;
while (true) {
if (width_tmp / 2 <= width || height_tmp / 2 <= height) {
break;
}
width_tmp /= 2;
height_tmp /= 2;
scale *= 2;
}
// decode with inSampleSize
final BitmapFactory.Options o2 = new BitmapFactory.Options();
o2.inSampleSize = scale;
final Bitmap prescale = BitmapFactory.decodeStream(new FileInputStream(localFile), null, o2);
if (prescale == null) {
Log.e(TAG, localFile + " could not be decoded");
}
return prescale;
}
private static final boolean USE_APACHE_NC = true;
}

@ -29,8 +29,9 @@ public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
progressBar.setProgress(0);
progressBar.setMax(0);
}
public ProgressBarSyncResultCallback(Activity activity, ProgressBar pBar,
int progressBarId, Runnable onFinished) {
Runnable onFinished) {
this.progressBar = pBar;
this.activity = activity;
this.onFinished = onFinished;
@ -39,7 +40,6 @@ public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
progressBar.setMax(0);
}
@Override
public void finished() {
if(providers.decrementAndGet() == 0) {

@ -19,11 +19,11 @@
*/
package com.todoroo.astrid.legacy;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractModel;
/** Legacy tag model */
@SuppressWarnings("nls")
abstract public class LegacyTagModel extends AbstractModel {
abstract public class LegacyTagModel extends LegacyAbstractModel {
public static final String NAME = "name";
public static final String NOTES = "notes";

@ -9,7 +9,6 @@ import com.todoroo.andlib.utility.Preferences;
public class ThemeService {
@SuppressWarnings("nls")
public static void applyTheme(Activity activity) {
activity.setTheme(getTheme());
@ -17,6 +16,7 @@ public class ThemeService {
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER);
}
@SuppressWarnings("nls")
public static int getTheme() {
String preference = Preferences.getStringValue(R.string.p_theme);
if(preference != null && preference.equals("black"))

@ -31,7 +31,6 @@ public class CalendarView extends View {
private static final int PADDING = 0;
private static final int TEXT_PADDING = 2;
private final static int OUTER_BORDER_RADIUS = 5;
private final static int CURVE_RADIUS = 0;
private final static int TEXT_SIZE = 16;
private static final float MONTH_TEXT_SIZE = 22;

@ -97,6 +97,6 @@ public class DateAndTimeDialog extends Dialog {
}
public String getDisplayString(Context context, long forDate) {
return dateAndTimePicker.getDisplayString(context, forDate);
return DateAndTimePicker.getDisplayString(context, forDate);
}
}

@ -112,7 +112,6 @@ public class DateAndTimePicker extends LinearLayout {
});
}
private void forceDateSelected() {
ToggleButton none = (ToggleButton) dateShortcuts.getChildAt(dateShortcuts.getChildCount() - 1);
if (none.isChecked()) {
@ -235,7 +234,7 @@ public class DateAndTimePicker extends LinearLayout {
if (d.getTime() > 0) {
displayString.append(DateUtilities.getDateString(context, d));
if (Task.hasDueTime(forDate)) {
displayString.append(", ");
displayString.append(", "); //$NON-NLS-1$
displayString.append(DateUtilities.getTimeString(context, d));
}
}

@ -39,7 +39,6 @@ public class EditNotesControlSet extends PopupControlSet {
@Override
protected void refreshDisplayView() {
notesPreview.setText("");
notesPreview.setText(editText.getText());
setupGravity();
linkifyDisplayView();

@ -35,8 +35,6 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
private int previousSetting = Task.HIDE_UNTIL_NONE;
private long existingDate = EXISTING_TIME_UNSET;
private int existingDateHour = EXISTING_TIME_UNSET;
private int existingDateMinutes = EXISTING_TIME_UNSET;
public HideUntilControlSet(Activity activity, int viewLayout, int displayViewLayout, int title) {
super(activity, viewLayout, displayViewLayout, title);
@ -97,13 +95,10 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
updated[0] = new HideUntilValue(DateUtilities.getDateString(activity, new Date(specificDate)),
Task.HIDE_UNTIL_SPECIFIC_DAY, specificDate);
existingDate = specificDate;
existingDateHour = SPECIFIC_DATE;
} else {
updated[0] = new HideUntilValue(DateUtilities.getDateStringWithTime(activity, new Date(specificDate)),
Task.HIDE_UNTIL_SPECIFIC_DAY_TIME, specificDate);
existingDate = specificDate;
existingDateHour = hideUntilAsDate.getHours();
existingDateMinutes = hideUntilAsDate.getMinutes();
}
values = updated;
}

@ -244,6 +244,7 @@ public class UrgencyControlSet extends TaskEditControlSet implements OnDeadlineT
updateButtons();
}
@SuppressWarnings("nls")
private void updateButtons() {
String auxString = "";
if(dueDateValue == 0) {

@ -20,57 +20,48 @@ import com.viewpagerindicator.TitleProvider;
public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
{
private static int[] images = new int[]
{
R.drawable.welcome_walkthrough_1,
R.drawable.welcome_walkthrough_2,
R.drawable.welcome_walkthrough_3,
R.drawable.welcome_walkthrough_4,
R.drawable.welcome_walkthrough_5,
//R.drawable.welcome_walkthrough_6,
0
};
private static int[] title = new int[]
{
R.string.welcome_title_1,
R.string.welcome_title_2,
R.string.welcome_title_3,
R.string.welcome_title_4,
R.string.welcome_title_5,
//R.string.welcome_title_6,
R.string.welcome_title_7,
};
private static int[] body = new int[]
{
R.string.welcome_body_1,
R.string.welcome_body_2,
R.string.welcome_body_3,
R.string.welcome_body_4,
R.string.welcome_body_5,
//R.string.welcome_body_6,
R.string.welcome_body_7,
};
private static int[] layouts = new int[]
{
private static int[] images = new int[] {
R.drawable.welcome_walkthrough_1,
R.drawable.welcome_walkthrough_2,
R.drawable.welcome_walkthrough_3,
R.drawable.welcome_walkthrough_4,
R.drawable.welcome_walkthrough_5,
0
};
private static int[] title = new int[] {
R.string.welcome_title_1,
R.string.welcome_title_2,
R.string.welcome_title_3,
R.string.welcome_title_4,
R.string.welcome_title_5,
R.string.welcome_title_7,
};
private static int[] body = new int[] {
R.string.welcome_body_1,
R.string.welcome_body_2,
R.string.welcome_body_3,
R.string.welcome_body_4,
R.string.welcome_body_5,
R.string.welcome_body_7,
};
private static int[] layouts = new int[] {
R.layout.welcome_walkthrough_page,
R.layout.welcome_walkthrough_page,
R.layout.welcome_walkthrough_page,
R.layout.welcome_walkthrough_page,
R.layout.welcome_walkthrough_page,
//R.layout.welcome_walkthrough_page,
R.layout.welcome_walkthrough_login_page,
};
};
private final Context context;
public WelcomeWalkthrough parent;
@Autowired ActFmPreferenceService actFmPreferenceService;
public ViewPagerAdapter( Context context, boolean manual)
{
public ViewPagerAdapter(Context context, boolean manual) {
this.context = context;
DependencyInjectionService.getInstance().inject(this);
if(manual) {
if (manual) {
layouts[layouts.length - 1] = R.layout.welcome_walkthrough_page;
title[title.length - 1] = R.string.welcome_title_7_return;
images[images.length - 1] = R.drawable.welcome_walkthrough_1;
@ -81,18 +72,18 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
@Override
public int getCount()
{
public int getCount() {
return layouts.length;
}
@Override
public Object instantiateItem( View pager, int position )
{
public Object instantiateItem(View pager, int position) {
LayoutInflater inflater = LayoutInflater.from(context);
View pageView = inflater.inflate(layouts[position], null, true);
pageView.setLayoutParams( new ViewGroup.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT));
pageView.setLayoutParams(new ViewGroup.LayoutParams(
WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.MATCH_PARENT));
if (pageView.findViewById(R.id.welcome_walkthrough_image) != null) {
ImageView imageView = (ImageView) pageView.findViewById(R.id.welcome_walkthrough_image);
@ -105,28 +96,30 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
bodyView.setText(body[position]);
}
((ViewPager)pager).addView( pageView, 0 );
((ViewPager) pager).addView(pageView, 0);
parent.pageScrolled(position, pageView);
return pageView;
}
@Override
public void destroyItem( View pager, int position, Object view )
{
((ViewPager)pager).removeView( (View)view );
public void destroyItem(View pager, int position, Object view) {
((ViewPager) pager).removeView((View) view);
}
@Override
public boolean isViewFromObject( View view, Object object )
{
return view.equals( object );
public boolean isViewFromObject(View view, Object object) {
return view.equals(object);
}
@Override
public void finishUpdate( View view ) {}
public void finishUpdate(View view) {
//
}
@Override
public void restoreState( Parcelable p, ClassLoader c ) {}
public void restoreState(Parcelable p, ClassLoader c) {
//
}
@Override
public Parcelable saveState() {
@ -134,8 +127,9 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
}
@Override
public void startUpdate( View view ) {}
public void startUpdate(View view) {
//
}
@Override
public String getTitle(int position) {

@ -26,7 +26,7 @@ import android.content.Context;
import android.database.Cursor;
import android.util.Log;
import com.timsu.astrid.data.AbstractModel;
import com.timsu.astrid.data.LegacyAbstractModel;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.astrid.upgrade.Astrid2To3UpgradeTests;
@ -57,7 +57,7 @@ abstract public class AbstractController {
// cursor iterator
public static class CursorIterator<TYPE extends AbstractModel> implements Iterator<TYPE> {
public static class CursorIterator<TYPE extends LegacyAbstractModel> implements Iterator<TYPE> {
Cursor cursor;
Class<TYPE> cls;

Loading…
Cancel
Save