From 356199978eaef303cef7faa90280dafb0425af71 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 14 Feb 2016 18:19:11 +0100 Subject: [PATCH] fixed server info push not showing up when unavailable --- .../conversations/services/PushManagementService.java | 4 ++++ .../eu/siacs/conversations/ui/EditAccountActivity.java | 4 ++-- .../conversations/services/PushManagementService.java | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/free/java/eu/siacs/conversations/services/PushManagementService.java b/src/free/java/eu/siacs/conversations/services/PushManagementService.java index ff97a5fb9..c6c5d2324 100644 --- a/src/free/java/eu/siacs/conversations/services/PushManagementService.java +++ b/src/free/java/eu/siacs/conversations/services/PushManagementService.java @@ -17,4 +17,8 @@ public class PushManagementService { public boolean available(Account account) { return false; } + + public boolean isStub() { + return true; + } } diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 9b6e40763..2656966bb 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -686,9 +686,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate this.mServerInfoHttpUpload.setText(R.string.server_info_unavailable); } - this.mPushRow.setVisibility(xmppConnectionService.getPushManagementService().available(mAccount) ? View.VISIBLE : View.GONE); + this.mPushRow.setVisibility(xmppConnectionService.getPushManagementService().isStub() ? View.GONE : View.VISIBLE); - if (features.push()) { + if (xmppConnectionService.getPushManagementService().available(mAccount)) { this.mServerInfoPush.setText(R.string.server_info_available); } else { this.mServerInfoPush.setText(R.string.server_info_unavailable); diff --git a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java index fbd768cf2..3fdaf8326 100644 --- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java @@ -76,9 +76,9 @@ public class PushManagementService { @Override public void onIqPacketReceived(Account account, IqPacket packet) { if (packet.getType() == IqPacket.TYPE.RESULT) { - Log.d(Config.LOGTAG,account.getJid().toBareJid()+": successfully enabled push on server"); + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": successfully enabled push on server"); } else if (packet.getType() == IqPacket.TYPE.ERROR) { - Log.d(Config.LOGTAG,account.getJid().toBareJid()+": enabling push on server failed"); + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": enabling push on server failed"); } } }); @@ -109,6 +109,10 @@ public class PushManagementService { return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS; } + public boolean isStub() { + return false; + } + interface OnGcmInstanceTokenRetrieved { void onGcmInstanceTokenRetrieved(String token); }