diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-29 19:14:13 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-29 19:14:13 +0100 |
| commit | 52a43db6d6912ad2147d560e343cac3b1b4cda97 (patch) | |
| tree | 43bdfd9d3a973e2eed7e2fca8d8667ab89477b22 /src/main/java | |
| parent | acf446a02c63a80b46c169cd9f0f4af027e61d50 (diff) | |
| parent | e43ac27e8f3dfabb69bc5edcb3eb005598270e81 (diff) | |
Merge pull request #721 from SamWhited/warning_fixes
Warning "fixes"
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 9 |
1 files changed, 6 insertions, 3 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) { } } |