aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-29 19:14:13 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-29 19:14:13 +0100
commit52a43db6d6912ad2147d560e343cac3b1b4cda97 (patch)
tree43bdfd9d3a973e2eed7e2fca8d8667ab89477b22 /src/main
parentacf446a02c63a80b46c169cd9f0f4af027e61d50 (diff)
parente43ac27e8f3dfabb69bc5edcb3eb005598270e81 (diff)
Merge pull request #721 from SamWhited/warning_fixes
Warning "fixes"
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java9
-rw-r--r--src/main/res/layout/account_row.xml3
-rw-r--r--src/main/res/layout/activity_edit_account.xml6
-rw-r--r--src/main/res/values/strings.xml2
4 files changed, 14 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 6744acb1..c6a38712 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -124,8 +124,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
mMoreDetails.setVisibility(View.GONE);
mInviteButton = (Button) findViewById(R.id.invite);
mInviteButton.setOnClickListener(inviteListener);
- getActionBar().setHomeButtonEnabled(true);
- getActionBar().setDisplayHomeAsUpEnabled(true);
+ if (getActionBar() != null) {
+ getActionBar().setHomeButtonEnabled(true);
+ getActionBar().setDisplayHomeAsUpEnabled(true);
+ }
mEditNickButton.setOnClickListener(new OnClickListener() {
@Override
@@ -364,6 +366,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
}
}
+ @SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setListItemBackgroundOnView(View view) {
int sdk = android.os.Build.VERSION.SDK_INT;
@@ -383,7 +386,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
try {
startIntentSenderForResult(intent.getIntentSender(), 0,
null, 0, 0, 0);
- } catch (SendIntentException e) {
+ } catch (SendIntentException ignored) {
}
}
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 2d1190a3..60b69090 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -10,7 +10,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
- android:src="@drawable/ic_profile" >
+ android:src="@drawable/ic_profile"
+ android:contentDescription="@string/account_image_description">
</ImageView>
<LinearLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index fa39ed5e..ed83cb9a 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -27,7 +27,8 @@
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
- android:layout_marginRight="16dp"/>
+ android:layout_marginRight="16dp"
+ android:contentDescription="@string/account_image_description"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@@ -236,7 +237,8 @@
android:background="?android:selectableItemBackground"
android:padding="8dp"
android:src="@drawable/ic_action_copy"
- android:visibility="visible" />
+ android:visibility="visible"
+ android:contentDescription="@string/copy_otr_clipboard_description"/>
</RelativeLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7e235f68..6b639452 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -358,4 +358,6 @@
<string name="conference_created">Conference created!</string>
<string name="secret_accepted">Secret accepted!</string>
<string name="reset">Reset</string>
+ <string name="account_image_description">Account avatar</string>
+ <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
</resources>