diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-03-06 15:53:49 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-03-06 15:53:49 +0100 |
| commit | e6a9829dd2b275f80231b19930fbb75b209f4c2e (patch) | |
| tree | e0baee0872f55dcc939266100da26f7b5ede4c2c /src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | |
| parent | 86fff5839aaf618367f3c50a2ad4274c16802aeb (diff) | |
don't show opt-out of battery optimization dialog when push is enabled
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index b6f1b430..ed80a509 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -641,11 +641,12 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate this.mRegisterNew.setChecked(false); } if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) { + Features features = this.mAccount.getXmppConnection().getFeatures(); this.mStats.setVisibility(View.VISIBLE); - this.mBatteryOptimizations.setVisibility(showBatteryOptimizationWarning() ? View.VISIBLE : View.GONE); + boolean showOptimizingWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery(); + this.mBatteryOptimizations.setVisibility(showOptimizingWarning ? View.VISIBLE : View.GONE); this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection() .getLastSessionEstablished())); - Features features = this.mAccount.getXmppConnection().getFeatures(); if (features.rosterVersioning()) { this.mServerInfoRosterVersion.setText(R.string.server_info_available); } else { |