move some placeholders into resources

4 files changed, 6 insertions, 5 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;
diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
index 4ff0bbe65..12c6b6caa 100644
--- a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
@@ -35,7 +35,6 @@
         style="@android:style/Widget.DeviceDefault.Button.Borderless.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Edit"
         android:id="@+id/edit"
         android:focusable="false"
         android:layout_alignTop="@+id/mainUserId"
@@ -46,7 +45,8 @@
         android:layout_alignBottom="@+id/mainUserIdRest"
         android:visibility="visible"
         android:enabled="true"
-        android:textColor="@color/black" />
+        android:textColor="@color/black"
+        android:text="@string/edit" />
 
     <TextView
         android:id="@+id/revoked"
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 3ca5f5426..7f0ad52ac 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -431,5 +431,7 @@
     <string name="nav_apps">Registered Apps</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
+    <string name="edit">Edit</string>
+    <string name="my_keys">My Keys</string>
 
 </resources>