Removed unused code, added display for tasks synchronized on remote server, updated translations.

pull/14/head
Tim Su 17 years ago
parent 85f892a24a
commit a63b5de137

@ -1,9 +1,9 @@
#Thu May 07 17:28:06 PDT 2009 #Sun May 17 17:33:53 PDT 2009
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@ -37,7 +37,7 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.nullReference=warning org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
@ -67,4 +67,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.source=1.6

@ -7,6 +7,8 @@
# "build.properties", and override values to adapt the script to your # "build.properties", and override values to adapt the script to your
# project structure. # project structure.
# Project target.
target=android-2
# apk configurations. This property allows creation of APK files with limited # apk configurations. This property allows creation of APK files with limited
# resources. For example, if your application contains many locales and # resources. For example, if your application contains many locales and
# you wish to release multiple smaller apks instead of a large one, you can # you wish to release multiple smaller apks instead of a large one, you can
@ -18,5 +20,3 @@
# apk-config-european=en,fr,it,de,es # apk-config-european=en,fr,it,de,es
# apk-config-northamerica=en,es # apk-config-northamerica=en,es
apk-configurations= apk-configurations=
# Project target.
target=android-3

@ -111,6 +111,7 @@
<string name="taskList_elapsedTimePrefix">Verbracht:</string><!-- i.e. Spent 88 minutes on tax. --> <string name="taskList_elapsedTimePrefix">Verbracht:</string><!-- i.e. Spent 88 minutes on tax. -->
<string name="taskList_periodicReminderPrefix">Anstubsen jede</string><!-- time interval to set frequency to remind user --> <string name="taskList_periodicReminderPrefix">Anstubsen jede</string><!-- time interval to set frequency to remind user -->
<string name="taskList_repeatPrefix">Wiederholt sich jede</string><!-- time interval to set repeated tasks--> <string name="taskList_repeatPrefix">Wiederholt sich jede</string><!-- time interval to set repeated tasks-->
<string name="taskList_repeatsRemotely">Wiederholt auf dem Server</string><!-- displayed when repeat is on remote server-->
<string name="taskList_alarmPrefix">Nächster Alarm:</string> <string name="taskList_alarmPrefix">Nächster Alarm:</string>
<string name="taskList_tagsPrefix">Tags:</string> <string name="taskList_tagsPrefix">Tags:</string>
<string name="taskList_notesPrefix">Notizen:</string> <string name="taskList_notesPrefix">Notizen:</string>
@ -278,9 +279,9 @@ Nach der Fertigstellung, starte Astrid neu und komm hierher zurück.
<string name="sync_result_merged">Zusammengeführt: %d</string> <string name="sync_result_merged">Zusammengeführt: %d</string>
<string name="sync_progress_remote">Empfange Daten vom Server</string> <string name="sync_progress_remote">Empfange Daten vom Server</string>
<string name="sync_progress_rxlist">Reading List: %s</string> <string name="sync_progress_rxlist">Empfange Liste: %s</string>
<string name="sync_progress_repeating">Synchronisiere wiederholende Aufgabe</string> <string name="sync_progress_repeating">Synchronisiere wiederholende Aufgabe</string>
<string name="sync_progress_localtx">Sende Aufgabe:: %s</string> <string name="sync_progress_localtx">Sende Aufgabe: %s</string>
<string name="sync_progress_localdel">Lokal gelöschte Aufgaben</string> <string name="sync_progress_localdel">Lokal gelöschte Aufgaben</string>
<string name="sync_progress_remotetx">Empfange Aufgabe: %s</string> <string name="sync_progress_remotetx">Empfange Aufgabe: %s</string>

@ -119,6 +119,7 @@
<string name="taskList_elapsedTimePrefix">Spent:</string><!-- i.e. Spent 88 minutes on tax. --> <string name="taskList_elapsedTimePrefix">Spent:</string><!-- i.e. Spent 88 minutes on tax. -->
<string name="taskList_periodicReminderPrefix">Poke Every</string><!-- time interval to set frequency to remind user --> <string name="taskList_periodicReminderPrefix">Poke Every</string><!-- time interval to set frequency to remind user -->
<string name="taskList_repeatPrefix">Repeats Every</string><!-- time interval to set repeated tasks--> <string name="taskList_repeatPrefix">Repeats Every</string><!-- time interval to set repeated tasks-->
<string name="taskList_repeatsRemotely">Repeats On Remote Server</string><!-- displayed when repeat is on remote server-->
<string name="taskList_alarmPrefix">Next Alarm:</string> <string name="taskList_alarmPrefix">Next Alarm:</string>
<string name="taskList_tagsPrefix">Tags:</string> <string name="taskList_tagsPrefix">Tags:</string>
<string name="taskList_notesPrefix">Notes:</string> <string name="taskList_notesPrefix">Notes:</string>

@ -38,15 +38,12 @@ import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion; import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient; import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicHeader;
import org.apache.http.params.BasicHttpParams; import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpProtocolParams; import org.apache.http.params.HttpProtocolParams;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.BasicHttpProcessor; import org.apache.http.protocol.BasicHttpProcessor;
import org.apache.http.protocol.HTTP; import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.RequestConnControl; import org.apache.http.protocol.RequestConnControl;
import org.apache.http.protocol.RequestContent; import org.apache.http.protocol.RequestContent;
import org.apache.http.protocol.RequestExpectContinue; import org.apache.http.protocol.RequestExpectContinue;
@ -104,12 +101,8 @@ public class Invoker {
private String serviceRelativeUri; private String serviceRelativeUri;
private HttpContext context;
private BasicHttpParams globalHttpParams; private BasicHttpParams globalHttpParams;
private DefaultConnectionReuseStrategy connectionStrategy;
private BasicHttpProcessor httpProcessor; private BasicHttpProcessor httpProcessor;
private HttpClient httpClient; private HttpClient httpClient;
@ -119,13 +112,11 @@ public class Invoker {
{ {
this.serviceRelativeUri = serviceRelativeUri; this.serviceRelativeUri = serviceRelativeUri;
new HttpHost(serverHostName, serverPortNumber); new HttpHost(serverHostName, serverPortNumber);
context = new BasicHttpContext();
globalHttpParams = new BasicHttpParams(); globalHttpParams = new BasicHttpParams();
HttpProtocolParams.setVersion(globalHttpParams, HttpVersion.HTTP_1_1); HttpProtocolParams.setVersion(globalHttpParams, HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(globalHttpParams, ENCODING); HttpProtocolParams.setContentCharset(globalHttpParams, ENCODING);
HttpProtocolParams.setUserAgent(globalHttpParams, "Jakarta-HttpComponents/1.1"); HttpProtocolParams.setUserAgent(globalHttpParams, "Jakarta-HttpComponents/1.1");
HttpProtocolParams.setUseExpectContinue(globalHttpParams, true); HttpProtocolParams.setUseExpectContinue(globalHttpParams, true);
connectionStrategy = new DefaultConnectionReuseStrategy();
httpProcessor = new BasicHttpProcessor(); httpProcessor = new BasicHttpProcessor();
// Required protocol interceptors // Required protocol interceptors

@ -478,12 +478,15 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
String cachedResult = task.getCachedLabel(KEY_REPEAT); String cachedResult = task.getCachedLabel(KEY_REPEAT);
if(cachedResult == null) { if(cachedResult == null) {
RepeatInfo repeatInfo = task.getRepeat(); RepeatInfo repeatInfo = task.getRepeat();
if(repeatInfo != null) { if((task.getFlags() & TaskModelForList.FLAG_SYNC_ON_COMPLETE) > 0) {
cachedResult = r.getString(R.string.taskList_repeatsRemotely);
} else if(repeatInfo != null) {
cachedResult = r.getString(R.string.taskList_repeatPrefix) + cachedResult = r.getString(R.string.taskList_repeatPrefix) +
" " + repeatInfo.getValue() + " " + " " + repeatInfo.getValue() + " " +
r.getString(repeatInfo.getInterval().getLabelResource()); r.getString(repeatInfo.getInterval().getLabelResource());
} else } else {
cachedResult = ""; cachedResult = "";
}
task.putCachedLabel(KEY_REPEAT, cachedResult); task.putCachedLabel(KEY_REPEAT, cachedResult);
} }
if(visibleFields.REPEATS) if(visibleFields.REPEATS)

@ -347,7 +347,7 @@ public class TaskListSubActivity extends SubActivity {
ALPHA { ALPHA {
@Override @Override
int compareTo(TaskModelForList arg0, TaskModelForList arg1) { int compareTo(TaskModelForList arg0, TaskModelForList arg1) {
return arg0.getName().compareTo(arg1.getName()); return arg0.getName().toLowerCase().compareTo(arg1.getName().toLowerCase());
} }
}, },
DUEDATE { DUEDATE {

@ -407,16 +407,6 @@ public class TaskController extends AbstractController {
return model; return model;
} }
/** Returns a TaskModelForView corresponding to the given TaskIdentifier */
public TaskModelForView fetchTaskForView(Activity activity,
TaskIdentifier taskId) throws SQLException {
Cursor cursor = fetchTaskCursor(taskId, TaskModelForView.FIELD_LIST);
activity.startManagingCursor(cursor);
TaskModelForView model = new TaskModelForView(taskId, cursor);
return model;
}
/** Returns a TaskModelForList corresponding to the given TaskIdentifier */ /** Returns a TaskModelForList corresponding to the given TaskIdentifier */
public TaskModelForList fetchTaskForList(TaskIdentifier taskId) throws SQLException { public TaskModelForList fetchTaskForList(TaskIdentifier taskId) throws SQLException {
Cursor cursor = fetchTaskCursor(taskId, TaskModelForList.FIELD_LIST); Cursor cursor = fetchTaskCursor(taskId, TaskModelForList.FIELD_LIST);

@ -49,6 +49,7 @@ public class TaskModelForList extends AbstractTaskModel {
HIDDEN_UNTIL, HIDDEN_UNTIL,
NOTES, NOTES,
REPEAT, REPEAT,
FLAGS,
}; };
// pre-load the cache for our column keys // pre-load the cache for our column keys
@ -213,6 +214,11 @@ public class TaskModelForList extends AbstractTaskModel {
return super.getCreationDate(); return super.getCreationDate();
} }
@Override
public int getFlags() {
return super.getFlags();
}
// --- setters // --- setters
@Override @Override

@ -1,136 +0,0 @@
/*
* ASTRID: Android's Simple Task Recording Dashboard
*
* Copyright (c) 2009 Tim Su
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package com.timsu.astrid.data.task;
import java.util.Date;
import android.database.Cursor;
import com.timsu.astrid.data.AbstractController;
import com.timsu.astrid.data.enums.Importance;
/** Fields that you would want to see in the TaskView activity */
public class TaskModelForView extends AbstractTaskModel {
static String[] FIELD_LIST = new String[] {
AbstractController.KEY_ROWID,
NAME,
IMPORTANCE,
PROGRESS_PERCENTAGE,
ESTIMATED_SECONDS,
ELAPSED_SECONDS,
TIMER_START,
DEFINITE_DUE_DATE,
PREFERRED_DUE_DATE,
HIDDEN_UNTIL,
CREATION_DATE,
NOTES,
};
// --- constructors
public TaskModelForView(TaskIdentifier identifier, Cursor cursor) {
super(identifier, cursor);
}
// --- getters and setters
@Override
public Integer getNotificationIntervalSeconds() {
return super.getNotificationIntervalSeconds();
}
@Override
public boolean isTaskCompleted() {
return super.isTaskCompleted();
}
@Override
public int getProgressPercentage() {
return super.getProgressPercentage();
}
@Override
public Date getDefiniteDueDate() {
return super.getDefiniteDueDate();
}
@Override
public Integer getEstimatedSeconds() {
return super.getEstimatedSeconds();
}
@Override
public Integer getElapsedSeconds() {
return super.getElapsedSeconds();
}
@Override
public Importance getImportance() {
return super.getImportance();
}
@Override
public String getName() {
return super.getName();
}
@Override
public String getNotes() {
return super.getNotes();
}
@Override
public Date getPreferredDueDate() {
return super.getPreferredDueDate();
}
@Override
public Date getTimerStart() {
return super.getTimerStart();
}
@Override
public Date getCreationDate() {
return super.getCreationDate();
}
@Override
public Date getHiddenUntil() {
return super.getHiddenUntil();
}
@Override
public void setTimerStart(Date timerStart) {
super.setTimerStart(timerStart);
}
@Override
public void setProgressPercentage(int progressPercentage) {
super.setProgressPercentage(progressPercentage);
}
@Override
public void stopTimerAndUpdateElapsedTime() {
super.stopTimerAndUpdateElapsedTime();
}
}

@ -215,11 +215,10 @@ public class Synchronizer {
typeClass = cls; typeClass = cls;
} }
@SuppressWarnings("unchecked")
public TYPE get(Context context) { public TYPE get(Context context) {
if(controller == null) { if(controller == null) {
try { try {
controller = (TYPE)typeClass.getConstructors()[0].newInstance(context); controller = typeClass.getConstructors()[0].newInstance(context);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
Log.e(getClass().getSimpleName(), e.toString()); Log.e(getClass().getSimpleName(), e.toString());
} catch (SecurityException e) { } catch (SecurityException e) {

Loading…
Cancel
Save