aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-03-08 12:28:20 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-03-08 12:28:20 +0100
commit7ad8977cf3f4117782d6568322ec76c5cd8e2475 (patch)
treed8923aacd346e2337166f698d7070798bb757456 /OpenPGP-Keychain/src/main/java/org/sufficientlysecure
parentaa8a8f069fb978563bf8d06994cfa7ef1fe316bd (diff)
downloadopen-keychain-7ad8977cf3f4117782d6568322ec76c5cd8e2475.tar.gz
open-keychain-7ad8977cf3f4117782d6568322ec76c5cd8e2475.tar.bz2
open-keychain-7ad8977cf3f4117782d6568322ec76c5cd8e2475.zip
move some placeholders into resources
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java3
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java2
2 files changed, 2 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
index dbc24504e..0099fb80d 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
@@ -426,7 +426,6 @@ public class KeyListFragment extends Fragment implements AdapterView.OnItemClick
final long id = cursor.getLong(mMasterKeyId);
button.setOnClickListener(new OnClickListener() {
public void onClick(View view) {
- Log.d(Constants.TAG, "swag");
Intent editIntent = new Intent(getActivity(), EditKeyActivity.class);
// editIntent.setData(KeychainContract.KeyRings.buildSecretKeyRingsUri(Long.toString(1)));
editIntent.setData(KeychainContract.KeyRings.buildSecretKeyRingsByMasterKeyIdUri(Long.toString(id)));
@@ -500,7 +499,7 @@ public class KeyListFragment extends Fragment implements AdapterView.OnItemClick
}
if(mCursor.getInt(KeyListFragment.INDEX_TYPE) == KeyTypes.SECRET) {
- holder.text.setText("My Keys");
+ holder.text.setText(convertView.getResources().getString(R.string.my_keys));
return convertView;
}
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index ab46b8efc..8f177dc6b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -114,7 +114,7 @@ public class ViewKeyActivity extends ActionBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
- Intent homeIntent = new Intent(this, KeyListPublicActivity.class);
+ Intent homeIntent = new Intent(this, KeyListActivity.class);
homeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(homeIntent);
return true;