Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do migration in backgrounded service.

Browse Source
This commit is contained in:
Moxie Marlinspike
2012-08-02 20:23:41 -07:00
parent 45ae16e684
commit cffedb09a1
7 changed files with 379 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@@ -22,10 +22,12 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.widget.Toast;
import com.actionbarsherlock.app.SherlockPreferenceActivity;
import com.actionbarsherlock.view.MenuItem;
import org.thoughtcrime.securesms.contacts.ContactAccessor;
import org.thoughtcrime.securesms.crypto.IdentityKey;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
@@ -41,7 +43,7 @@ import org.thoughtcrime.securesms.util.MemoryCleaner;
*
*/
public class ApplicationPreferencesActivity extends PreferenceActivity {
public class ApplicationPreferencesActivity extends SherlockPreferenceActivity {
private static final int PICK_IDENTITY_CONTACT = 1;
private static final int IMPORT_IDENTITY_ID = 2;
@@ -69,6 +71,9 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
@Override
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
addPreferencesFromResource(R.xml.preferences);
this.findPreference(IDENTITY_PREF).setOnPreferenceClickListener(new IdentityPreferenceClickListener());
@@ -113,6 +118,15 @@ public class ApplicationPreferencesActivity extends PreferenceActivity {
super.onDestroy();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home: finish(); return true;
}
return false;
}
private void handleIdentitySelection(Intent data) {
Uri contactData = data.getData();
if (contactData != null)