PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

fix compile

Browse source
This commit is contained in:
Dominik Schürmann 2014-01-12 22:26:55 +01:00
parent 100ae50e02
commit c740d409c4
3 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OpenPGP-Keychain/AndroidManifest.xml
View file

@ -115,7 +115,7 @@
android:label="@string/title_edit_key" android:label="@string/title_edit_key"
android:windowSoftInputMode="stateHidden" /> android:windowSoftInputMode="stateHidden" />
<activity <activity
android:name=".ui.KeyViewActivity" android:name=".ui.ViewKeyActivity"
android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
android:label="@string/title_key_details" android:label="@string/title_key_details"
android:parentActivityName=".ui.KeyListPublicActivity" > android:parentActivityName=".ui.KeyListPublicActivity" >

40
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/adapter/KeyListAdapterOLD.java
View file

@ -18,12 +18,12 @@ package org.sufficientlysecure.keychain.ui.adapter;
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.helper.OtherHelper; import org.sufficientlysecure.keychain.helper.OtherHelper;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
import org.sufficientlysecure.keychain.provider.KeychainContract.Keys; import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.R;
import android.content.Context; import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
@ -36,7 +36,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CursorTreeAdapter; import android.widget.CursorTreeAdapter;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
public class KeyListAdapterOLD extends CursorTreeAdapter { public class KeyListAdapterOLD extends CursorTreeAdapter {
@ -97,27 +96,27 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
} }
} }
/** // /**
* Inflate new view for child items // * Inflate new view for child items
*/ // */
@Override // @Override
public View newChildView(Context context, Cursor cursor, boolean isLastChild, ViewGroup parent) { // public View newChildView(Context context, Cursor cursor, boolean isLastChild, ViewGroup parent) {
return mInflater.inflate(R.layout.key_list_child_item, null); // return mInflater.inflate(R.layout.key_list_child_item, null);
} // }
/** /**
* Bind TextViews from view of childs based on query results * Bind TextViews from view of childs based on query results
*/ */
@Override @Override
protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) { protected void bindChildView(View view, Context context, Cursor cursor, boolean isLastChild) {
LinearLayout keyLayout = (LinearLayout) view.findViewById(R.id.keyLayout); // LinearLayout keyLayout = (LinearLayout) view.findViewById(R.id.keyLayout);
LinearLayout userIdLayout = (LinearLayout) view.findViewById(R.id.userIdLayout); // LinearLayout userIdLayout = (LinearLayout) view.findViewById(R.id.userIdLayout);
// first entry is fingerprint // first entry is fingerprint
if (cursor.getPosition() == 0) { if (cursor.getPosition() == 0) {
// show only userId layout // show only userId layout
keyLayout.setVisibility(View.GONE); // keyLayout.setVisibility(View.GONE);
userIdLayout.setVisibility(View.VISIBLE); // userIdLayout.setVisibility(View.VISIBLE);
String fingerprint = PgpKeyHelper.getFingerPrint(context, String fingerprint = PgpKeyHelper.getFingerPrint(context,
cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID))); cursor.getLong(cursor.getColumnIndex(Keys.KEY_ID)));
@ -131,8 +130,8 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
} else { } else {
// differentiate between keys and userIds in MergeCursor // differentiate between keys and userIds in MergeCursor
if (cursor.getColumnIndex(Keys.KEY_ID) != -1) { if (cursor.getColumnIndex(Keys.KEY_ID) != -1) {
keyLayout.setVisibility(View.VISIBLE); // keyLayout.setVisibility(View.VISIBLE);
userIdLayout.setVisibility(View.GONE); // userIdLayout.setVisibility(View.GONE);
String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(cursor String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(cursor
.getColumnIndex(Keys.KEY_ID))); .getColumnIndex(Keys.KEY_ID)));
@ -174,8 +173,8 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
signIcon.setVisibility(View.VISIBLE); signIcon.setVisibility(View.VISIBLE);
} }
} else { } else {
keyLayout.setVisibility(View.GONE); // keyLayout.setVisibility(View.GONE);
userIdLayout.setVisibility(View.VISIBLE); // userIdLayout.setVisibility(View.VISIBLE);
String userIdStr = cursor.getString(cursor.getColumnIndex(UserIds.USER_ID)); String userIdStr = cursor.getString(cursor.getColumnIndex(UserIds.USER_ID));
@ -270,4 +269,11 @@ public class KeyListAdapterOLD extends CursorTreeAdapter {
return mContext.getContentResolver().query(uri, projection, selection, null, sortOrder); return mContext.getContentResolver().query(uri, projection, selection, null, sortOrder);
} }
@Override
protected View newChildView(Context context, Cursor cursor, boolean isLastChild,
ViewGroup parent) {
// TODO Auto-generated method stub
return null;
}
} }

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
View file

@ -90,7 +90,7 @@ public class SetPassphraseDialogFragment extends DialogFragment implements OnEdi
alert.setMessage(R.string.enter_passphrase_twice); alert.setMessage(R.string.enter_passphrase_twice);
LayoutInflater inflater = activity.getLayoutInflater(); LayoutInflater inflater = activity.getLayoutInflater();
View view = inflater.inflate(R.layout.passphrase_repeat_dialogf, null); View view = inflater.inflate(R.layout.passphrase_repeat_dialog, null);
alert.setView(view); alert.setView(view);
mPassphraseEditText = (EditText) view.findViewById(R.id.passphrase_passphrase); mPassphraseEditText = (EditText) view.findViewById(R.id.passphrase_passphrase);