mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-07 01:35:00 -05:00
fix import, add missing multi select menu
This commit is contained in:
parent
1970d4be6e
commit
14a8738933
9
OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
Normal file
9
OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_key_list_public_multi_delete"
|
||||||
|
android:icon="@android:drawable/ic_menu_delete"
|
||||||
|
android:title="@string/menu_delete_key"/>
|
||||||
|
|
||||||
|
</menu>
|
@ -20,14 +20,13 @@ package org.sufficientlysecure.keychain.ui;
|
|||||||
import org.sufficientlysecure.keychain.Constants;
|
import org.sufficientlysecure.keychain.Constants;
|
||||||
import org.sufficientlysecure.keychain.Id;
|
import org.sufficientlysecure.keychain.Id;
|
||||||
import org.sufficientlysecure.keychain.R;
|
import org.sufficientlysecure.keychain.R;
|
||||||
import org.sufficientlysecure.keychain.helper.ActionBarHelper;
|
|
||||||
|
|
||||||
import com.actionbarsherlock.view.Menu;
|
|
||||||
import com.actionbarsherlock.view.MenuItem;
|
|
||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import com.actionbarsherlock.view.Menu;
|
||||||
|
import com.actionbarsherlock.view.MenuItem;
|
||||||
|
|
||||||
public class KeyListPublicActivity extends KeyActivity {
|
public class KeyListPublicActivity extends KeyActivity {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -59,7 +58,6 @@ public class KeyListPublicActivity extends KeyActivity {
|
|||||||
return true;
|
return true;
|
||||||
case R.id.menu_key_list_public_import:
|
case R.id.menu_key_list_public_import:
|
||||||
Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class);
|
Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class);
|
||||||
intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
|
|
||||||
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -92,7 +92,6 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
|
|||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class);
|
Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class);
|
||||||
intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
|
|
||||||
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -71,7 +71,6 @@ public class KeyListSecretActivity extends KeyActivity {
|
|||||||
return true;
|
return true;
|
||||||
case R.id.menu_key_list_secret_import:
|
case R.id.menu_key_list_secret_import:
|
||||||
Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class);
|
Intent intentImportFromFile = new Intent(this, ImportKeysActivity.class);
|
||||||
intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
|
|
||||||
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user