moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-07 18:50:11 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:k9mail/k-9

Browse Source 
* 'master' of github.com:k9mail/k-9:
  Cosmetic changes
  Removed unused method
  Workaround for below issue.
This commit is contained in:
Andrew Chen 2011-09-01 07:23:40 -07:00
commit 339c9f1eee
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/fsck/k9/activity/MessageView.java
View File

@ -124,7 +124,7 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
@Override @Override
public void onMount(String providerId) {} // no-op public void onMount(String providerId) { /* no-op */ }
} }
@ -349,28 +349,21 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, final Intent originatingIntent) {
actionView(context, messRef, messReferences, null, originatingIntent);
}
/** /**
* @param context * @param context
* @param messRef * @param messRef
* @param messReferences * @param messReferences
* @param extras
* @param originatingIntent * @param originatingIntent
* The intent that allow us to get back to the calling screen, for when the 'Manage * The intent that allow us to get back to the calling screen, for when the 'Manage
* BACK' option is enabled. Never {@code null}. * "Back" button' option is enabled. Never {@code null}.
*/ */
public static void actionView(Context context, MessageReference messRef, ArrayList<MessageReference> messReferences, Bundle extras, final Intent originatingIntent) { public static void actionView(Context context, MessageReference messRef,
ArrayList<MessageReference> messReferences, final Intent originatingIntent) {
Intent i = new Intent(context, MessageView.class); Intent i = new Intent(context, MessageView.class);
i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef); i.putExtra(EXTRA_MESSAGE_REFERENCE, messRef);
i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences); i.putParcelableArrayListExtra(EXTRA_MESSAGE_REFERENCES, messReferences);
i.putExtra(EXTRA_ORIGINATING_INTENT, originatingIntent); i.putExtra(EXTRA_ORIGINATING_INTENT, originatingIntent);
if (extras != null) { i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
i.putExtras(extras);
}
context.startActivity(i); context.startActivity(i);
} }
@ -434,7 +427,7 @@ public class MessageView extends K9Activity implements OnClickListener {
} else { } else {
List<String> segmentList = uri.getPathSegments(); List<String> segmentList = uri.getPathSegments();
if (segmentList.size() != 3) { if (segmentList.size() != 3) {
//TODO: Use ressource to externalize message //TODO: Use resource to externalize message
Toast.makeText(this, "Invalid intent uri: " + uri.toString(), Toast.LENGTH_LONG).show(); Toast.makeText(this, "Invalid intent uri: " + uri.toString(), Toast.LENGTH_LONG).show();
return; return;
} }
@ -450,7 +443,7 @@ public class MessageView extends K9Activity implements OnClickListener {
} }
} }
if (!found) { if (!found) {
//TODO: Use ressource to externalize message //TODO: Use resource to externalize message
Toast.makeText(this, "Invalid account id: " + accountId, Toast.LENGTH_LONG).show(); Toast.makeText(this, "Invalid account id: " + accountId, Toast.LENGTH_LONG).show();
return; return;
} }