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

Code cleanup

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 5842171d63
commit 3dc29fdaa9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

17
astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
Unescape Escape View File

@ -78,7 +78,6 @@ public class UpdateMessageService {
public void processUpdates() { public void processUpdates() {
JSONArray updates = checkForUpdates(); JSONArray updates = checkForUpdates();
System.err.println("UPDATES: " + updates);
// try { // try {
// JSONObject test = new JSONObject(); // JSONObject test = new JSONObject();
@ -109,13 +108,13 @@ public class UpdateMessageService {
void showDialog(Activity activity); void showDialog(Activity activity);
} }
private void showDialog(DialogShower shower) { private void showDialog(DialogShower ds) {
try { try {
shower.showDialog(activity); ds.showDialog(activity);
} catch (BadTokenException bt) { } catch (BadTokenException bt) {
try { try {
Activity current = (Activity) ContextManager.getContext(); Activity current = (Activity) ContextManager.getContext();
shower.showDialog(current); ds.showDialog(current);
} catch (ClassCastException c) { } catch (ClassCastException c) {
// Oh well, context wasn't an activity // Oh well, context wasn't an activity
} catch (BadTokenException bt2) { } catch (BadTokenException bt2) {
@ -128,14 +127,14 @@ public class UpdateMessageService {
if(activity == null) if(activity == null)
return; return;
final DialogShower shower; final DialogShower ds;
if (message instanceof Spannable) { if (message instanceof Spannable) {
final TextView textView = new TextView(activity); final TextView textView = new TextView(activity);
textView.setText(message); textView.setText(message);
textView.setTextSize(16); textView.setTextSize(16);
textView.setTextColor(activity.getResources().getColor(ThemeService.getDialogTextColor())); textView.setTextColor(activity.getResources().getColor(ThemeService.getDialogTextColor()));
textView.setMovementMethod(LinkMovementMethod.getInstance()); textView.setMovementMethod(LinkMovementMethod.getInstance());
shower = new DialogShower() { ds = new DialogShower() {
@Override @Override
public void showDialog(Activity a) { public void showDialog(Activity a) {
final Dialog d = new AlertDialog.Builder(a) final Dialog d = new AlertDialog.Builder(a)
@ -156,7 +155,7 @@ public class UpdateMessageService {
String color = ThemeService.getDialogTextColorString(); String color = ThemeService.getDialogTextColorString();
final String html = "<html><body style='color: " + color + "'>" + final String html = "<html><body style='color: " + color + "'>" +
message + "</body></html>"; message + "</body></html>";
shower = new DialogShower() { ds = new DialogShower() {
@Override @Override
public void showDialog(Activity a) { public void showDialog(Activity a) {
DialogUtilities.htmlDialog(a, DialogUtilities.htmlDialog(a,
@ -168,7 +167,7 @@ public class UpdateMessageService {
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
showDialog(shower); showDialog(ds);
} }
}); });
@ -203,7 +202,7 @@ public class UpdateMessageService {
String type = update.optString("type", null); String type = update.optString("type", null);
if ("screen".equals(type) || "pref".equals(type)) { if ("screen".equals(type) || "pref".equals(type)) {
String linkText = update.optString("link"); String linkText = update.optString("link");
Spannable span = Spannable.Factory.getInstance().newSpannable(message + "\n" + linkText); Spannable span = Spannable.Factory.getInstance().newSpannable(message + "\n\n" + linkText);
ClickableSpan click = getClickableSpanForUpdate(update, type); ClickableSpan click = getClickableSpanForUpdate(update, type);
if (click == null) if (click == null)
continue; continue;

Write Preview
Loading…
Cancel
Save