moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-14 05:25:07 -05:00
Code Issues Releases Wiki Activity

merge fixups

Browse Source
This commit is contained in:
Jesse Vincent 2012-04-10 19:44:17 -04:00 committed by Andrew Chen
parent 2152512529
commit 5fa5b69688
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -26,7 +26,9 @@
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- Needed to get the owner name which is used when the first mail account is created -->
<uses-permission android:name="android.permission.READ_OWNER_DATA"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" /> <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />
<permission android:name="com.fsck.k9.permission.READ_ATTACHMENT" <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"

17
src/com/fsck/k9/Account.java
View File

@ -133,19 +133,12 @@ public class Account implements BaseAccount {
// decide on owners name // decide on owners name
String name = ""; String name = "";
try { try {
name = Contacts.getInstance(context).getOwnerName(); Account account = Preferences.getPreferences(context).getDefaultAccount();
} catch (Exception e) { if (account != null) {
Log.e(K9.LOG_TAG, "Could not get owner name, using default account name", e); name = account.getName();
}
if (name == null || name.length() == 0) {
try {
Account account = Preferences.getPreferences(context).getDefaultAccount();
if (account != null) {
name = account.getName();
}
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Could not get default account name", e);
} }
} catch (Exception e) {
Log.e(K9.LOG_TAG, "Could not get default account name", e);
} }
if (name == null) { if (name == null) {
name = ""; name = "";

2
src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
View File

@ -140,7 +140,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList
setMessage(R.string.account_setup_check_settings_fetch); setMessage(R.string.account_setup_check_settings_fetch);
} }
MessagingController.getInstance(getApplication()).listFoldersSynchronous(mAccount, true, null); MessagingController.getInstance(getApplication()).listFoldersSynchronous(mAccount, true, null);
MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, K9.INBOX , null, null); MessagingController.getInstance(getApplication()).synchronizeMailbox(mAccount, mAccount.getInboxFolderName() , null, null);
} }
if (mDestroyed) { if (mDestroyed) {
return; return;