moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-14 07:08:00 -05:00
Code Issues Releases Wiki Activity

display pendingIntent button when there is a pendingIntent only

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-01-30 11:30:36 +01:00
parent a0b4faf688
commit 0374dc9cb1
3 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
View File

@ -56,6 +56,7 @@ import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns;
import com.fsck.k9.view.MessageHeader.OnLayoutChangedListener; import com.fsck.k9.view.MessageHeader.OnLayoutChangedListener;
import com.fsck.k9.view.MessageWebView; import com.fsck.k9.view.MessageWebView;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.openintents.openpgp.OpenPgpError;
public class MessageContainerView extends LinearLayout implements OnClickListener, public class MessageContainerView extends LinearLayout implements OnClickListener,
@ -446,7 +447,13 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
resetView(); resetView();
// Save the text so we can reset the WebView when the user clicks the "Show pictures" button // Save the text so we can reset the WebView when the user clicks the "Show pictures" button
mText = messageViewContainer.text; OpenPgpError error = messageViewContainer.pgpError;
if (error != null) {
// TODO make a nice view for this
mText = error.getMessage();
} else {
mText = messageViewContainer.text;
}
mHasAttachments = !messageViewContainer.attachments.isEmpty(); mHasAttachments = !messageViewContainer.attachments.isEmpty();
if (mHasAttachments) { if (mHasAttachments) {

32
k9mail/src/main/java/com/fsck/k9/ui/messageview/OpenPgpHeaderView.java
View File

@ -72,6 +72,7 @@ public class OpenPgpHeaderView extends LinearLayout {
} }
}); });
} else { } else {
mResultSignatureButton.setVisibility(View.GONE);
mResultSignatureButton.setOnClickListener(null); mResultSignatureButton.setOnClickListener(null);
} }
@ -93,7 +94,6 @@ public class OpenPgpHeaderView extends LinearLayout {
setStatusImage(mContext, mResultSignatureIcon, mResultSignatureText, STATE_INVALID); setStatusImage(mContext, mResultSignatureIcon, mResultSignatureText, STATE_INVALID);
mResultSignatureText.setText(R.string.openpgp_result_invalid_signature); mResultSignatureText.setText(R.string.openpgp_result_invalid_signature);
mResultSignatureButton.setVisibility(View.GONE);
mResultSignatureLayout.setVisibility(View.GONE); mResultSignatureLayout.setVisibility(View.GONE);
break; break;
} }
@ -102,8 +102,10 @@ public class OpenPgpHeaderView extends LinearLayout {
mResultSignatureText.setText(R.string.openpgp_result_signature_certified); mResultSignatureText.setText(R.string.openpgp_result_signature_certified);
setUserId(signatureResult); setUserId(signatureResult);
mResultSignatureButton.setText(R.string.openpgp_result_action_show); if (pendingIntent != null) {
mResultSignatureButton.setVisibility(View.VISIBLE); mResultSignatureButton.setVisibility(View.VISIBLE);
mResultSignatureButton.setText(R.string.openpgp_result_action_show);
}
mResultSignatureLayout.setVisibility(View.VISIBLE); mResultSignatureLayout.setVisibility(View.VISIBLE);
break; break;
@ -113,8 +115,10 @@ public class OpenPgpHeaderView extends LinearLayout {
mResultSignatureText.setText(R.string.openpgp_result_signature_missing_key); mResultSignatureText.setText(R.string.openpgp_result_signature_missing_key);
setUserId(signatureResult); setUserId(signatureResult);
mResultSignatureButton.setText(R.string.openpgp_result_action_lookup); if (pendingIntent != null) {
mResultSignatureButton.setVisibility(View.VISIBLE); mResultSignatureButton.setVisibility(View.VISIBLE);
mResultSignatureButton.setText(R.string.openpgp_result_action_lookup);
}
mResultSignatureLayout.setVisibility(View.VISIBLE); mResultSignatureLayout.setVisibility(View.VISIBLE);
break; break;
@ -124,8 +128,10 @@ public class OpenPgpHeaderView extends LinearLayout {
mResultSignatureText.setText(R.string.openpgp_result_signature_uncertified); mResultSignatureText.setText(R.string.openpgp_result_signature_uncertified);
setUserId(signatureResult); setUserId(signatureResult);
mResultSignatureButton.setText(R.string.openpgp_result_action_show); if (pendingIntent != null) {
mResultSignatureButton.setVisibility(View.VISIBLE); mResultSignatureButton.setVisibility(View.VISIBLE);
mResultSignatureButton.setText(R.string.openpgp_result_action_show);
}
mResultSignatureLayout.setVisibility(View.VISIBLE); mResultSignatureLayout.setVisibility(View.VISIBLE);
break; break;
@ -135,8 +141,10 @@ public class OpenPgpHeaderView extends LinearLayout {
mResultSignatureText.setText(R.string.openpgp_result_signature_expired_key); mResultSignatureText.setText(R.string.openpgp_result_signature_expired_key);
setUserId(signatureResult); setUserId(signatureResult);
mResultSignatureButton.setText(R.string.openpgp_result_action_show); if (pendingIntent != null) {
mResultSignatureButton.setVisibility(View.VISIBLE); mResultSignatureButton.setVisibility(View.VISIBLE);
mResultSignatureButton.setText(R.string.openpgp_result_action_show);
}
mResultSignatureLayout.setVisibility(View.VISIBLE); mResultSignatureLayout.setVisibility(View.VISIBLE);
break; break;
@ -146,8 +154,10 @@ public class OpenPgpHeaderView extends LinearLayout {
mResultSignatureText.setText(R.string.openpgp_result_signature_revoked_key); mResultSignatureText.setText(R.string.openpgp_result_signature_revoked_key);
setUserId(signatureResult); setUserId(signatureResult);
mResultSignatureButton.setText(R.string.openpgp_result_action_show); if (pendingIntent != null) {
mResultSignatureButton.setVisibility(View.VISIBLE); mResultSignatureButton.setVisibility(View.VISIBLE);
mResultSignatureButton.setText(R.string.openpgp_result_action_show);
}
mResultSignatureLayout.setVisibility(View.VISIBLE); mResultSignatureLayout.setVisibility(View.VISIBLE);
break; break;

8
k9mail/src/main/res/layout/message_view_openpgp_header.xml
View File

@ -28,7 +28,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Not Encrypted (set in-code)" android:text="Not Encrypted"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" /> android:layout_marginBottom="2dp" />
@ -51,7 +51,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Signed by (set in-code)" android:text="Not signed"
android:layout_marginLeft="4dp" android:layout_marginLeft="4dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" /> android:layout_marginBottom="2dp" />
@ -95,14 +95,14 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Alice (set in-code)" /> android:text="Alice" />
<TextView <TextView
android:id="@+id/result_signature_email" android:id="@+id/result_signature_email"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="alice@example.com (set in-code)" android:text="alice@example.com"
android:gravity="center_vertical" /> android:gravity="center_vertical" />
</LinearLayout> </LinearLayout>