Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a4d12b5 authored by Jesse Vincent's avatar Jesse Vincent
Browse files

Merge from apg-integration

parent bae8a973

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
    <uses-permission android:name="android.permission.VIBRATE"/>

    <uses-permission android:name="android.permission.WAKE_LOCK"/>

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="org.thialfihar.android.apg.permission.READ_KEY_DETAILS" />



    <permission android:name="com.fsck.k9.permission.READ_ATTACHMENT"

                android:permissionGroup="android.permission-group.MESSAGES"

                android:protectionLevel="dangerous"

res/drawable/overlay_error.png

0 → 100644
+1.16 KiB
Loading image diff...

res/drawable/overlay_ok.png

0 → 100644
+1.01 KiB
Loading image diff...

res/drawable/signed_large.png

0 → 100644
+2.55 KiB
Loading image diff...

res/layout/message_compose.xml

+65 −5
Original line number Diff line number Diff line
@@ -70,6 +70,66 @@ 
                    android:textAppearance="?android:attr/textAppearanceMedium"

                    android:visibility="gone" />



                <LinearLayout

                    android:id="@+id/layout_encrypt"

                    android:orientation="horizontal"

                    android:layout_width="fill_parent"

                    android:layout_height="wrap_content"

                    android:visibility="gone"

                    android:paddingLeft="6dip"

                    android:paddingRight="6dip">



                    <LinearLayout

                        android:orientation="horizontal"

                        android:layout_gravity="center_vertical"

                        android:layout_width="0dip"

                        android:layout_height="wrap_content"

                        android:layout_weight="1">



                        <CheckBox

                            android:text="@string/btn_crypto_sign"

                            android:id="@+id/cb_crypto_signature"

                            android:layout_gravity="center_vertical"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"/>



                        <LinearLayout

                            android:orientation="vertical"

                            android:layout_gravity="center_vertical"

                            android:layout_height="wrap_content"

                            android:layout_width="wrap_content"

                            android:paddingRight="2dip">



                            <TextView

                                android:id="@+id/userId"

                                android:text=""

                                android:ellipsize="end"

                                android:textAppearance="?android:attr/textAppearanceSmall"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                            <TextView

                                android:id="@+id/userIdRest"

                                android:text=""

                                android:textSize="10sp"

                                android:ellipsize="end"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                        </LinearLayout>



                    </LinearLayout>



                    <CheckBox

                        android:text="@string/btn_encrypt"

                        android:id="@+id/cb_encrypt"

                        android:layout_gravity="center_vertical"

                        android:layout_width="0dip"

                        android:layout_height="wrap_content"

                        android:layout_weight="1"/>



                </LinearLayout>



                <EditText

                    android:id="@+id/subject"

                    android:layout_width="fill_parent"