diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-13 00:03:57 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-13 00:03:57 +0100 |
| commit | c7a14092a818262b8479a5bfff45c45689f6e755 (patch) | |
| tree | 31e104a517bb0facb1c45568ef23a7c43219d88d /src/playstore | |
| parent | 6217e33a8766650c94014b4c436a29ac1372c795 (diff) | |
fixed compile bug in free version
Diffstat (limited to '')
| -rw-r--r-- | src/playstore/java/eu/siacs/conversations/services/PushManagementService.java | 11 | ||||
| -rw-r--r-- | src/playstore/res/values/gcm.xml | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java index d65170ee..68e824cb 100644 --- a/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java @@ -20,7 +20,7 @@ import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class PushManagementService { - private static final String APP_SERVER = "push.conversations.im"; + private static final String APP_SERVER = "push.siacs.eu"; protected final XmppConnectionService mXmppConnectionService; @@ -64,12 +64,13 @@ public class PushManagementService { } - public boolean available() { - return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS; + + public boolean available(Account account) { + return account.getXmppConnection().getFeatures().push() && playServicesAvailable(); } - public boolean pushAvailable(Account account) { - return account.getXmppConnection().getFeatures().push() && available(); + private boolean playServicesAvailable() { + return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mXmppConnectionService) == ConnectionResult.SUCCESS; } interface OnGcmInstanceTokenRetrieved { diff --git a/src/playstore/res/values/gcm.xml b/src/playstore/res/values/gcm.xml new file mode 100644 index 00000000..ee780d77 --- /dev/null +++ b/src/playstore/res/values/gcm.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="gcm_defaultSenderId" translatable="false">159709679736</string> + <string name="google_app_id">1:159709679736:android:a61b47ae910a1ad7</string> +</resources> |