I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add "All mail" view

Browse Source
This commit is contained in:
str4d
2015-06-01 13:59:13 +00:00
parent 75aa2bfb82
commit 0ad8bf43f9
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/i2p/bote/android/EmailListActivity.java
View File

@@ -80,6 +80,7 @@ public class EmailListActivity extends BoteActivityBase implements
private static final int ID_ADDRESS_BOOK = 1; private static final int ID_ADDRESS_BOOK = 1;
private static final int ID_NET_STATUS = 2; private static final int ID_NET_STATUS = 2;
private static final int ID_ALL_MAIL = 3;
private static final int LOADER_IDENTITIES = 0; private static final int LOADER_IDENTITIES = 0;
private static final int LOADER_DRAWER_FOLDERS = 1; private static final int LOADER_DRAWER_FOLDERS = 1;
@@ -326,7 +327,8 @@ public class EmailListActivity extends BoteActivityBase implements
private void identitySelected(IProfile profile) { private void identitySelected(IProfile profile) {
EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag(); EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag();
mSharedPrefs.edit() mSharedPrefs.edit()
.putString(Constants.PREF_SELECTED_IDENTITY, identity.getKey()) .putString(Constants.PREF_SELECTED_IDENTITY,
identity == null ? null : identity.getKey())
.apply(); .apply();
EmailListFragment f = (EmailListFragment) getSupportFragmentManager() EmailListFragment f = (EmailListFragment) getSupportFragmentManager()
.findFragmentById(R.id.list_fragment); .findFragmentById(R.id.list_fragment);
@@ -407,16 +409,14 @@ public class EmailListActivity extends BoteActivityBase implements
public void onLoadFinished(Loader<ArrayList<IProfile>> loader, ArrayList<IProfile> data) { public void onLoadFinished(Loader<ArrayList<IProfile>> loader, ArrayList<IProfile> data) {
mAccountHeader.setProfiles(data); mAccountHeader.setProfiles(data);
String selectedIdentity = mSharedPrefs.getString(Constants.PREF_SELECTED_IDENTITY, null); String selectedIdentity = mSharedPrefs.getString(Constants.PREF_SELECTED_IDENTITY, null);
if (selectedIdentity != null) {
for (IProfile profile : data) { for (IProfile profile : data) {
EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag(); EmailIdentity identity = (EmailIdentity) ((ProfileDrawerItem) profile).getTag();
if (selectedIdentity.equals(identity.getKey())) { if ((identity == null && selectedIdentity == null) ||
(identity != null && identity.getKey().equals(selectedIdentity))) {
mAccountHeader.setActiveProfile(profile, true); mAccountHeader.setActiveProfile(profile, true);
break; break;
} }
} }
} else // AccountHeader selects the first one by default
identitySelected(data.get(0));
} }
@Override @Override
@@ -438,7 +438,14 @@ public class EmailListActivity extends BoteActivityBase implements
public ArrayList<IProfile> loadInBackground() { public ArrayList<IProfile> loadInBackground() {
ArrayList<IProfile> profiles = new ArrayList<>(); ArrayList<IProfile> profiles = new ArrayList<>();
try { try {
// Fetch the identities first, so we trigger any exceptions
Collection<EmailIdentity> identities = I2PBote.getInstance().getIdentities().getAll(); Collection<EmailIdentity> identities = I2PBote.getInstance().getIdentities().getAll();
profiles.add(new ProfileDrawerItem()
.withIdentifier(ID_ALL_MAIL)
.withTag(null)
.withName(getContext().getString(R.string.all_mail))
.withIcon(getContext().getResources().getDrawable(R.drawable.ic_contact_picture))
);
for (EmailIdentity identity : identities) { for (EmailIdentity identity : identities) {
profiles.add(getIdentityDrawerItem(identity)); profiles.add(getIdentityDrawerItem(identity));
} }

1
app/src/main/res/values/strings.xml
View File

@@ -67,6 +67,7 @@
<string name="checking_password">Checking password…</string> <string name="checking_password">Checking password…</string>
<string name="password_incorrect">Password was incorrect</string> <string name="password_incorrect">Password was incorrect</string>
<string name="password_file_error">Could not read password verification file</string> <string name="password_file_error">Could not read password verification file</string>
<string name="all_mail">All mail</string>
<string name="folder_inbox">Inbox</string> <string name="folder_inbox">Inbox</string>
<string name="folder_outbox">Outbox</string> <string name="folder_outbox">Outbox</string>
<string name="folder_sent">Sent</string> <string name="folder_sent">Sent</string>