ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 281c6365: Add a new FolderUri

Browse Source 
* commit '281c6365fb95037ca284dd8c910538639e8b3dcb':
  Add a new FolderUri
This commit is contained in:
Scott Kennedy 2013-07-16 15:29:21 -07:00 committed by Android Git Automerger
commit 1cd31cea40
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/email/activity/setup/AccountSettings.java
View File

@ -357,7 +357,8 @@ public class AccountSettings extends PreferenceActivity implements FeedbackEnabl
// See bug 6242668
// Get the mailbox id from the folder
final long mailboxId = Long.parseLong(folder.uri.getPathSegments().get(1));
final long mailboxId =
Long.parseLong(folder.folderUri.fullUri.getPathSegments().get(1));
MailboxSettings.start(this, mailboxId);
finish();

2
src/com/android/email/provider/EmailProvider.java
View File

@ -3986,7 +3986,7 @@ public class EmailProvider extends ContentProvider {
message.mId);
} else {
final Folder f = flist.folders.get(0);
final Uri uri = f.uri;
final Uri uri = f.folderUri.fullUri;
final Long mailboxId = Long.parseLong(uri.getLastPathSegment());
putIntegerLongOrBoolean(ourValues, MessageColumns.MAILBOX_KEY, mailboxId);
}

2
src/com/android/email/provider/FolderPickerActivity.java
View File

@ -180,7 +180,7 @@ public class FolderPickerActivity extends Activity implements FolderPickerCallba
@Override
public void select(Folder folder) {
String folderId = folder.uri.getLastPathSegment();
String folderId = folder.folderUri.fullUri.getLastPathSegment();
Long id = Long.parseLong(folderId);
ContentValues values = new ContentValues();

6
src/com/android/email/provider/WidgetProvider.java
View File

@ -107,10 +107,10 @@ public class WidgetProvider extends BaseWidgetProvider {
if (uiAccount != null && uiFolder != null) {
WidgetService.saveWidgetInformation(context, widgetId, uiAccount,
uiFolder.uri.toString());
uiFolder.folderUri.fullUri.toString());
updateWidgetInternal(context, widgetId, uiAccount, uiFolder.type, uiFolder.uri,
uiFolder.conversationListUri, uiFolder.name);
updateWidgetInternal(context, widgetId, uiAccount, uiFolder.type,
uiFolder.folderUri.fullUri, uiFolder.conversationListUri, uiFolder.name);
// Now remove the old legacy preference value
editor.remove(LEGACY_ACCOUNT_ID_PREFIX + widgetId);

2
src/com/android/email2/ui/MailActivityEmail.java
View File

@ -321,6 +321,6 @@ public class MailActivityEmail extends com.android.mail.ui.MailActivity {
folderCursor.close();
}
return Utils.createViewFolderIntent(this, folder.uri, account);
return Utils.createViewFolderIntent(this, folder.folderUri.fullUri, account);
}
}