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

Started refactoring update message service to handle different message types

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 45585203cf
commit f1f1816b46
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -18,7 +18,10 @@ import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.text.Spannable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.ClickableSpan;
import android.view.View;
import android.view.WindowManager.BadTokenException; import android.view.WindowManager.BadTokenException;
import com.timsu.astrid.R; import com.timsu.astrid.R;
@ -77,25 +80,29 @@ public class UpdateMessageService {
if(updates == null || updates.length() == 0) if(updates == null || updates.length() == 0)
return; return;
StringBuilder builder = buildUpdateMessage(updates); CharSequence message = buildUpdateMessage(updates);
if(builder.length() == 0) if(message.length() == 0)
return; return;
displayUpdateDialog(builder); displayUpdateDialog(message);
} }
protected boolean shouldSkipUpdates() { protected boolean shouldSkipUpdates() {
return !(context instanceof Activity); return !(context instanceof Activity);
} }
protected void displayUpdateDialog(StringBuilder builder) { protected void displayUpdateDialog(CharSequence message) {
final Activity activity = (Activity) context; final Activity activity = (Activity) context;
if(activity == null) if(activity == null)
return; return;
if (message instanceof Spannable) {
// Stuff
}
String color = ThemeService.getDialogTextColor(); String color = ThemeService.getDialogTextColor();
final String html = "<html><body style='color: " + color + "'>" + final String html = "<html><body style='color: " + color + "'>" +
builder.append("</body></html>").toString(); message + "</body></html>";
activity.runOnUiThread(new Runnable() { activity.runOnUiThread(new Runnable() {
@Override @Override
@ -118,7 +125,7 @@ public class UpdateMessageService {
}); });
} }
protected StringBuilder buildUpdateMessage(JSONArray updates) { protected CharSequence buildUpdateMessage(JSONArray updates) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for(int i = 0; i < updates.length(); i++) { for(int i = 0; i < updates.length(); i++) {
@ -129,6 +136,7 @@ public class UpdateMessageService {
continue; continue;
} }
String date = update.optString("date", null); String date = update.optString("date", null);
String message = update.optString("message", null); String message = update.optString("message", null);
String plugin = update.optString("plugin", null); String plugin = update.optString("plugin", null);
@ -148,12 +156,27 @@ public class UpdateMessageService {
if(messageAlreadySeen(date, message)) if(messageAlreadySeen(date, message))
continue; continue;
String type = update.optString("type", null);
if ("screen".equals(type) || "pref".equals(type)) {
String linkText = update.optString("link");
Spannable span = Spannable.Factory.getInstance().newSpannable(message + " " + linkText);
span.setSpan(new ClickableSpan() {
@Override
public void onClick(View widget) {
// Do things
}
}, span.length() - linkText.length(), span.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
return span;
}
if(date != null) if(date != null)
builder.append("<b>" + date + "</b><br />"); builder.append("<b>" + date + "</b><br />");
builder.append(message); builder.append(message);
builder.append("<br /><br />"); builder.append("<br /><br />");
return builder.toString();
} }
return builder; return builder.toString();
} }
private boolean pluginConditionMatches(String plugin) { private boolean pluginConditionMatches(String plugin) {
@ -200,7 +223,8 @@ public class UpdateMessageService {
String result = restClient.get(URL + "?version=" + versionCode + "&" + String result = restClient.get(URL + "?version=" + versionCode + "&" +
"language=" + Locale.getDefault().getISO3Language() + "&" + "language=" + Locale.getDefault().getISO3Language() + "&" +
"market=" + Constants.MARKET_STRATEGY.strategyId() + "&" + "market=" + Constants.MARKET_STRATEGY.strategyId() + "&" +
"actfm=" + (actFmPreferenceService.isLoggedIn() ? "1" : "0")); //$NON-NLS-1$ "actfm=" + (actFmPreferenceService.isLoggedIn() ? "1" : "0") + "&" +
"premium=" + (ActFmPreferenceService.isPremiumUser() ? "1" : "0")); //$NON-NLS-1$
if(TextUtils.isEmpty(result)) if(TextUtils.isEmpty(result))
return null; return null;

Write Preview
Loading…
Cancel
Save