diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-10 22:03:23 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-10 22:03:23 +0100 |
| commit | dc98b3dbd5ce9da547fd62ffeaf98650f5586fd5 (patch) | |
| tree | daf019950a6e99b5f3fba32ec9a289e881dc063a /src/main/res | |
| parent | 8740b55d37ce62e686afbf5d302fb49498ab6ab7 (diff) | |
added snackbar to indicate smp. more error handling in verify activity
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/activity_verify_otr.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index 60047333..d907d871 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -8,7 +8,18 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"> + <TextView + android:id="@+id/error_no_session" + android:layout_margin="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_otr_session_found" + android:layout_gravity="center_horizontal" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + /> <RelativeLayout + android:id="@+id/verification_area_one" android:layout_width="fill_parent" android:layout_height="fill_parent" android:background="@drawable/infocard_border" @@ -90,6 +101,7 @@ </LinearLayout> </RelativeLayout> <RelativeLayout + android:id="@+id/verification_area_two" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="8dp" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a663b233..8c4db54d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -326,4 +326,6 @@ <string name="try_again">Try again</string>; <string name="finish">Finish</string> <string name="verified">Verified!</string> + <string name="smp_requested">Contact requested SMP verification</string> + <string name="no_otr_session_found">No valid OTR session has been found!</string> </resources> |