sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #721 from SamWhited/warning_fixes 

Warning "fixes"
This commit is contained in:
Daniel Gultsch 2014-11-29 19:14:13 +01:00
parent acf446a02c e43ac27e8f
commit 52a43db6d6
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View File

@ -124,8 +124,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
mMoreDetails.setVisibility(View.GONE); mMoreDetails.setVisibility(View.GONE);
mInviteButton = (Button) findViewById(R.id.invite); mInviteButton = (Button) findViewById(R.id.invite);
mInviteButton.setOnClickListener(inviteListener); mInviteButton.setOnClickListener(inviteListener);
getActionBar().setHomeButtonEnabled(true); if (getActionBar() != null) {
getActionBar().setDisplayHomeAsUpEnabled(true); getActionBar().setHomeButtonEnabled(true);
getActionBar().setDisplayHomeAsUpEnabled(true);
}
mEditNickButton.setOnClickListener(new OnClickListener() { mEditNickButton.setOnClickListener(new OnClickListener() {
@Override @Override
@ -364,6 +366,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
} }
} }
@SuppressWarnings("deprecation")
@TargetApi(Build.VERSION_CODES.JELLY_BEAN) @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setListItemBackgroundOnView(View view) { private void setListItemBackgroundOnView(View view) {
int sdk = android.os.Build.VERSION.SDK_INT; int sdk = android.os.Build.VERSION.SDK_INT;
@ -383,7 +386,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
try { try {
startIntentSenderForResult(intent.getIntentSender(), 0, startIntentSenderForResult(intent.getIntentSender(), 0,
null, 0, 0, 0); null, 0, 0, 0);
} catch (SendIntentException e) { } catch (SendIntentException ignored) {
} }
} }

3
src/main/res/layout/account_row.xml
View File

@ -10,7 +10,8 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:src="@drawable/ic_profile" > android:src="@drawable/ic_profile"
android:contentDescription="@string/account_image_description">
</ImageView> </ImageView>
<LinearLayout <LinearLayout

6
src/main/res/layout/activity_edit_account.xml
View File

@ -27,7 +27,8 @@
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginRight="16dp"/> android:layout_marginRight="16dp"
android:contentDescription="@string/account_image_description"/>
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -236,7 +237,8 @@
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_action_copy" android:src="@drawable/ic_action_copy"
android:visibility="visible" /> android:visibility="visible"
android:contentDescription="@string/copy_otr_clipboard_description"/>
</RelativeLayout> </RelativeLayout>

2
src/main/res/values/strings.xml
View File

@ -358,4 +358,6 @@
<string name="conference_created">Conference created!</string> <string name="conference_created">Conference created!</string>
<string name="secret_accepted">Secret accepted!</string> <string name="secret_accepted">Secret accepted!</string>
<string name="reset">Reset</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> </resources>