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

some fixes for compiling (still not working!)

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-03-02 14:45:44 +01:00
parent 2f83291920
commit 5e53a5417c
7 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
View File

@@ -34,15 +34,12 @@ import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets; import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.provider.KeychainContract.Certs;
import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets;
import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import java.util.ArrayList; import java.util.ArrayList;
public class UserAttributesAdapter extends CursorAdapter implements AdapterView.OnItemClickListener { public abstract class UserAttributesAdapter extends CursorAdapter implements AdapterView.OnItemClickListener {
private LayoutInflater mInflater; private LayoutInflater mInflater;
private final ArrayList<Boolean> mCheckStates; private final ArrayList<Boolean> mCheckStates;
private SaveKeyringParcel mSaveKeyringParcel; private SaveKeyringParcel mSaveKeyringParcel;
@@ -77,18 +74,6 @@ public class UserAttributesAdapter extends CursorAdapter implements AdapterView.
mShowStatusImages = showStatusImages; mShowStatusImages = showStatusImages;
} }
public UserAttributesAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) {
this(context, c, flags, showCheckBoxes, null);
}
public UserAttributesAdapter(Context context, Cursor c, int flags, SaveKeyringParcel saveKeyringParcel) {
this(context, c, flags, false, saveKeyringParcel);
}
public UserAttributesAdapter(Context context, Cursor c, int flags) {
this(context, c, flags, false, null);
}
@Override @Override
public Cursor swapCursor(Cursor newCursor) { public Cursor swapCursor(Cursor newCursor) {
if (mCheckStates != null) { if (mCheckStates != null) {

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java
View File

@@ -161,17 +161,17 @@ public class LinkedIdCreateDnsStep2Fragment extends Fragment {
mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE); mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE);
if (success == null) { if (success == null) {
mVerifyStatus.setText(R.string.linked_verifying); mVerifyStatus.setText(R.string.linked_verifying);
mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light), mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else if (success) { } else if (success) {
mVerifyStatus.setText(R.string.linked_verify_success); mVerifyStatus.setText(R.string.linked_verify_success);
mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else { } else {
mVerifyStatus.setText(R.string.linked_verify_error); mVerifyStatus.setText(R.string.linked_verify_error);
mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} }

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java
View File

@@ -163,17 +163,17 @@ public class LinkedIdCreateHttpsStep2Fragment extends Fragment {
mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE); mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE);
if (success == null) { if (success == null) {
mVerifyStatus.setText(R.string.linked_verifying); mVerifyStatus.setText(R.string.linked_verifying);
mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light), mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else if (success) { } else if (success) {
mVerifyStatus.setText(R.string.linked_verify_success); mVerifyStatus.setText(R.string.linked_verify_success);
mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else { } else {
mVerifyStatus.setText(R.string.linked_verify_error); mVerifyStatus.setText(R.string.linked_verify_error);
mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} }

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
View File

@@ -144,17 +144,17 @@ public class LinkedIdCreateTwitterStep3Fragment extends Fragment {
mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE); mVerifyImage.setVisibility(on ? View.GONE : View.VISIBLE);
if (success == null) { if (success == null) {
mVerifyStatus.setText(R.string.linked_verifying); mVerifyStatus.setText(R.string.linked_verifying);
mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unverified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light), mVerifyImage.setColorFilter(getResources().getColor(R.color.tertiary_text_light),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else if (success) { } else if (success) {
mVerifyStatus.setText(R.string.linked_verify_success); mVerifyStatus.setText(R.string.linked_verify_success);
mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_verified_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_green_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} else { } else {
mVerifyStatus.setText(R.string.linked_verify_error); mVerifyStatus.setText(R.string.linked_verify_error);
mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout); mVerifyImage.setImageResource(R.drawable.status_signature_unknown_cutout_24px);
mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark), mVerifyImage.setColorFilter(getResources().getColor(R.color.android_red_dark),
PorterDuff.Mode.SRC_IN); PorterDuff.Mode.SRC_IN);
} }

2
OpenKeychain/src/main/res/layout/linked_create_dns_fragment_step2.xml
View File

@@ -74,7 +74,7 @@
<ImageView <ImageView
android:id="@+id/verify_image" android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout" android:src="@drawable/status_signature_unverified_cutout_24px"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
OpenKeychain/src/main/res/layout/linked_create_https_fragment_step2.xml
View File

@@ -78,7 +78,7 @@
<ImageView <ImageView
android:id="@+id/verify_image" android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout" android:src="@drawable/status_signature_unverified_cutout_24px"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
OpenKeychain/src/main/res/layout/linked_create_twitter_fragment_step3.xml
View File

@@ -82,7 +82,7 @@
<ImageView <ImageView
android:id="@+id/verify_image" android:id="@+id/verify_image"
android:src="@drawable/status_signature_unverified_cutout" android:src="@drawable/status_signature_unverified_cutout_24px"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"