moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 01:32:16 -05:00
Code Issues 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
Show Stats 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); final long id = cursor.getLong(mMasterKeyId);
button.setOnClickListener(new OnClickListener() { button.setOnClickListener(new OnClickListener() {
public void onClick(View view) { public void onClick(View view) {
Log.d(Constants.TAG, "swag");
Intent editIntent = new Intent(getActivity(), EditKeyActivity.class); Intent editIntent = new Intent(getActivity(), EditKeyActivity.class);
// editIntent.setData(KeychainContract.KeyRings.buildSecretKeyRingsUri(Long.toString(1))); // editIntent.setData(KeychainContract.KeyRings.buildSecretKeyRingsUri(Long.toString(1)));
editIntent.setData(KeychainContract.KeyRings.buildSecretKeyRingsByMasterKeyIdUri(Long.toString(id))); 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) { 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; 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) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: 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); homeIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(homeIntent); startActivity(homeIntent);
return true; return true;

4
OpenPGP-Keychain/src/main/res/layout/key_list_item.xml
View File

@ -35,7 +35,6 @@
style="@android:style/Widget.DeviceDefault.Button.Borderless.Small" style="@android:style/Widget.DeviceDefault.Button.Borderless.Small"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Edit"
android:id="@+id/edit" android:id="@+id/edit"
android:focusable="false" android:focusable="false"
android:layout_alignTop="@+id/mainUserId" android:layout_alignTop="@+id/mainUserId"
@ -46,7 +45,8 @@
android:layout_alignBottom="@+id/mainUserIdRest" android:layout_alignBottom="@+id/mainUserIdRest"
android:visibility="visible" android:visibility="visible"
android:enabled="true" android:enabled="true"
android:textColor="@color/black" /> android:textColor="@color/black"
android:text="@string/edit" />
<TextView <TextView
android:id="@+id/revoked" android:id="@+id/revoked"

2
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@ -431,5 +431,7 @@
<string name="nav_apps">Registered Apps</string> <string name="nav_apps">Registered Apps</string>
<string name="drawer_open">Open navigation drawer</string> <string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string> <string name="drawer_close">Close navigation drawer</string>
<string name="edit">Edit</string>
<string name="my_keys">My Keys</string>
</resources> </resources>