cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move some placeholders into resources

Browse Source
This commit is contained in:
Vincent Breitmoser
2014-03-08 12:28:20 +01:00
parent aa8a8f069f
commit 7ad8977cf3
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@@ -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;
}

2
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
View File

@@ -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;