wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed empty account name at import dialog

Browse source
This commit is contained in:
GoneUp 2017-01-05 23:10:14 +01:00
parent 92196c0128
commit 7df4ad00ad
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
View file

@ -17,6 +17,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
import android.content.Context;
import android.content.SharedPreferences;
import android.support.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.Log;
import com.fsck.k9.Account;
@ -133,7 +134,13 @@ public class SettingsImporter {
// will not be null.
if (imported.accounts != null) {
for (ImportedAccount account : imported.accounts.values()) {
accounts.add(new AccountDescription(account.name, account.uuid));
//Show a alternative text in the case the description is empty
String name = account.name;
if (TextUtils.isEmpty(name) && account.identities != null && account.identities.size() > 0){
name = account.identities.get(0).email;
}
accounts.add(new AccountDescription(name, account.uuid));
}
}
@ -935,11 +942,8 @@ public class SettingsImporter {
account.settings = parseSettings(xpp, SettingsExporter.SETTINGS_ELEMENT);
}
} else if (SettingsExporter.IDENTITIES_ELEMENT.equals(element)) {
if (overview) {
skipToEndTag(xpp, SettingsExporter.IDENTITIES_ELEMENT);
} else {
account.identities = parseIdentities(xpp);
}
//Read the full content to have an alternative identifier to display if the name is empty
account.identities = parseIdentities(xpp);
} else if (SettingsExporter.FOLDERS_ELEMENT.equals(element)) {
if (overview) {
skipToEndTag(xpp, SettingsExporter.FOLDERS_ELEMENT);