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

Implement legacy identity headers in Setting

Browse Source
This commit is contained in:
str4d
2015-01-05 01:36:17 +00:00
parent 7d3cd077d1
commit dc844ab12a
1 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/main/java/i2p/bote/android/config/SettingsActivity.java
View File

@ -30,6 +30,7 @@ import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
@ -50,6 +51,7 @@ public class SettingsActivity extends PreferenceActivity {
// Preference Header vars
private Header[] mIdentityListHeaders;
private Preference[] mLegacyIdentityListHeaders;
private String mRequestedIdentityKey;
private String mDeletingIdentityKey;
@ -181,9 +183,24 @@ public class SettingsActivity extends PreferenceActivity {
private void buildLegacyHeaders() {
// Always add general preferences as first header
addPreferencesFromResource(R.xml.settings_headers_legacy);
PreferenceScreen ps = getPreferenceScreen();
// Then add zero or more identity headers as necessary
// TODO: implement
if (mLegacyIdentityListHeaders != null) {
final int headerCount = mLegacyIdentityListHeaders.length;
for (Preference header : mLegacyIdentityListHeaders) {
if (header != null) {
String key = header.getIntent().getExtras().getString(
ViewIdentityFragment.ADDRESS);
if (!key.equals(mDeletingIdentityKey)) {
ps.addPreference(header);
if (key.equals(mRequestedIdentityKey)) {
mRequestedIdentityKey = null;
}
}
}
}
}
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
@ -201,14 +218,13 @@ public class SettingsActivity extends PreferenceActivity {
// Then add zero or more identity headers as necessary
if (mIdentityListHeaders != null) {
final int headerCount = mIdentityListHeaders.length;
for (int index = 0; index < headerCount; index++) {
Header header = mIdentityListHeaders[index];
for (Header header : mIdentityListHeaders) {
if (header != null && header.id != HEADER_ID_UNDEFINED) {
String key = header.extras.getString(
ViewIdentityFragment.ADDRESS);
if (key != mDeletingIdentityKey) {
if (!key.equals(mDeletingIdentityKey)) {
target.add(header);
if (key == mRequestedIdentityKey) {
if (key.equals(mRequestedIdentityKey)) {
mRequestedIdentityKey = null;
}
}
@ -407,8 +423,26 @@ public class SettingsActivity extends PreferenceActivity {
}
private Object[] loadLegacyHeaders(Collection<EmailIdentity> identities) {
// TODO: implement
return new Object[] {null};
Preference[] result = new Preference[identities.size()];
int index = 0;
for (EmailIdentity identity : identities) {
final String name = identity.getPublicName();
final String desc = identity.getDescription();
final String key = identity.getKey();
final Intent intent = new Intent(
getApplicationContext(), ViewIdentityActivity.class);
final Bundle args = new Bundle();
args.putString(ViewIdentityFragment.ADDRESS, key);
intent.putExtras(args);
final Preference newHeader = new Preference(SettingsActivity.this);
newHeader.setTitle(name);
newHeader.setSummary(desc);
newHeader.setIntent(intent);
result[index++] = newHeader;
}
return new Object[] {result};
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
@ -449,13 +483,14 @@ public class SettingsActivity extends PreferenceActivity {
}
private void showLegacyHeaders(Object[] result) {
// TODO: implement
mLegacyIdentityListHeaders = (Preference[]) result[0];
getPreferenceScreen().removeAll();
buildLegacyHeaders();
}
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
private void showHeaders(Object[] result) {
final Header[] headers = (Header[]) result[0];
mIdentityListHeaders = headers;
mIdentityListHeaders = (Header[]) result[0];
invalidateHeaders();
}