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

am 67e78a67: Merge "Clean up usage of Account.name when accessing account/folder prefs" into jb-ub-mail-ur10

Browse Source 
* commit '67e78a67baa5f301e136a38c050ac1ee5dc600f1':
  Clean up usage of Account.name when accessing account/folder prefs
This commit is contained in:
Tony Mantler 2013-10-11 18:35:55 -07:00 committed by Android Git Automerger
commit cc51a7913b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/NotificationController.java
View File

@ -321,7 +321,7 @@ public class NotificationController {
if (folder != null) {
final FolderPreferences folderPreferences = new FolderPreferences(
mContext, uiAccount.name, folder, true /* inbox */);
mContext, uiAccount.getEmailAddress(), folder, true /* inbox */);
ringtoneUri = folderPreferences.getNotificationRingtoneUri();
vibrate = folderPreferences.isNotificationVibrateEnabled();

4
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -581,9 +581,9 @@ public class AccountSettingsFragment extends PreferenceFragment
}
final AccountPreferences accountPreferences =
new AccountPreferences(mContext, mUiAccount.name);
new AccountPreferences(mContext, mUiAccount.getEmailAddress());
mInboxFolderPreferences =
new FolderPreferences(mContext, mUiAccount.name, folder, true);
new FolderPreferences(mContext, mUiAccount.getEmailAddress(), folder, true);
NotificationUtils.moveNotificationSetting(
accountPreferences, mInboxFolderPreferences);

2
src/com/android/email/activity/setup/AccountSetupOptions.java
View File

@ -254,7 +254,7 @@ public class AccountSetupOptions extends AccountSetupActivity implements OnClick
// We can move the notification setting to the inbox FolderPreferences later, once
// we know what the inbox is
final AccountPreferences accountPreferences =
new AccountPreferences(context, account.mEmailAddress);
new AccountPreferences(context, account.getEmailAddress());
accountPreferences.setDefaultInboxNotificationsEnabled(mNotifyView.isChecked());
}
});

3
src/com/android/email/preferences/EmailPreferenceMigrator.java
View File

@ -144,7 +144,8 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
}
final FolderPreferences folderPreferences =
new FolderPreferences(context, account.name, folder, true /* inbox */);
new FolderPreferences(context, account.getEmailAddress(), folder,
true /* inbox */);
@SuppressWarnings("deprecation")
final boolean notify = (ecAccount.getFlags()