narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

show doze warning when push is running on prosody

Browse source
This commit is contained in:
Daniel Gultsch 2017-01-12 23:22:02 +01:00
parent 1876b444fa
commit 8e025cbb9e
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/free/java/eu/siacs/conversations/services/PushManagementService.java
View file

@ -21,4 +21,8 @@ public class PushManagementService {
public boolean isStub() { public boolean isStub() {
return true; return true;
} }
public boolean availableAndUseful(Account account) {
return false;
}
} }

2
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -1498,7 +1498,7 @@ public class ConversationActivity extends XmppActivity
private boolean hasAccountWithoutPush() { private boolean hasAccountWithoutPush() {
for(Account account : xmppConnectionService.getAccounts()) { for(Account account : xmppConnectionService.getAccounts()) {
if (account.getStatus() != Account.State.DISABLED if (account.getStatus() != Account.State.DISABLED
&& !xmppConnectionService.getPushManagementService().available(account)) { && !xmppConnectionService.getPushManagementService().availableAndUseful(account)) {
return true; return true;
} }
} }

2
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -836,7 +836,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) { if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
Features features = this.mAccount.getXmppConnection().getFeatures(); Features features = this.mAccount.getXmppConnection().getFeatures();
this.mStats.setVisibility(View.VISIBLE); this.mStats.setVisibility(View.VISIBLE);
boolean showBatteryWarning = !xmppConnectionService.getPushManagementService().available(mAccount) && isOptimizingBattery(); boolean showBatteryWarning = !xmppConnectionService.getPushManagementService().availableAndUseful(mAccount) && isOptimizingBattery();
boolean showDataSaverWarning = isAffectedByDataSaver(); boolean showDataSaverWarning = isAffectedByDataSaver();
showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning); showOsOptimizationWarning(showBatteryWarning,showDataSaverWarning);
this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection() this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()

4
src/playstore/java/eu/siacs/conversations/services/PushManagementService.java
View file

@ -106,6 +106,10 @@ public class PushManagementService {
return connection != null && connection.getFeatures().push() && playServicesAvailable(); return connection != null && connection.getFeatures().push() && playServicesAvailable();
} }
public boolean availableAndUseful(Account account) {
return account.getServerIdentity() == XmppConnection.Identity.EJABBERD && available(account);
}
private boolean playServicesAvailable() { private boolean playServicesAvailable() {
return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS; return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS;
} }