diff options
5 files changed, 33 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle index d3c665c35..595ae5648 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ repositories { } configurations { - standardPushimplementation + standardPushImplementation } ext { @@ -42,11 +42,14 @@ ext { dependencies { implementation project(':libs:android-transcoder') - standardPushimplementation('com.google.firebase:firebase-messaging:15.0.2') { + standardPushImplementation ('com.google.firebase:firebase-messaging:15.0.2') { exclude group: 'com.google.firebase', module: 'firebase-core' } implementation 'org.sufficientlysecure:openpgp-api:10.0' - implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0' + implementation('com.theartofdev.edmodo:android-image-cropper:2.7.+') { + exclude group: 'com.android.support', module: 'appcompat-v7' + exclude group: 'com.android.support', module: 'exifinterface' + } implementation 'org.bouncycastle:bcmail-jdk15on:1.58' implementation 'org.jitsi:org.otr4j:0.22' implementation 'org.gnu.inet:libidn:1.15' @@ -122,7 +125,10 @@ android { flavorDimensions("distribution") productFlavors { - standardPush + standardPush { + dimension "distribution" + versionNameSuffix "+p" + } standard } if (project.hasProperty('mStoreFile') && @@ -138,11 +144,6 @@ android { } } buildTypes { - debug { - debuggable true - buildTypes.release.signingConfig = null - } - release { debuggable false signingConfig = signingConfigs.release @@ -151,11 +152,22 @@ android { runProguard true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } + + debug { + debuggable true + buildTypes.release.signingConfig = null + minifyEnabled true + shrinkResources true + runProguard true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } } lintOptions { disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi' + checkReleaseBuilds false } subprojects { diff --git a/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java b/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java index 3db7219c0..3e9a00a3c 100644 --- a/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java +++ b/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java @@ -1,6 +1,7 @@ package de.pixart.messenger.services; import android.content.Intent; + import com.google.firebase.iid.FirebaseInstanceIdService; public class InstanceIdService extends FirebaseInstanceIdService { diff --git a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java b/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java index 9ee13c6cd..9368913bc 100644 --- a/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java +++ b/src/standardPush/java/de/pixart/messenger/services/MaintenanceReceiver.java @@ -32,5 +32,6 @@ public class MaintenanceReceiver extends BroadcastReceiver { Log.d(Config.LOGTAG, "unable to renew instance token", e); } }).start(); + } }
\ No newline at end of file diff --git a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java b/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java index b9aff036b..7daa552d4 100644 --- a/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java +++ b/src/standardPush/java/de/pixart/messenger/services/PushManagementService.java @@ -2,7 +2,12 @@ package de.pixart.messenger.services; import android.util.Log; +import com.google.android.gms.common.ConnectionResult; +import com.google.android.gms.common.GoogleApiAvailability; +import com.google.firebase.iid.FirebaseInstanceId; + import de.pixart.messenger.Config; +import de.pixart.messenger.R; import de.pixart.messenger.entities.Account; import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.utils.PhoneHelper; @@ -14,8 +19,6 @@ import rocks.xmpp.addr.Jid; public class PushManagementService { - private static final Jid APP_SERVER = Jid.of("p2.siacs.eu"); - protected final XmppConnectionService mXmppConnectionService; PushManagementService(XmppConnectionService service) { @@ -26,7 +29,8 @@ public class PushManagementService { Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": has push support"); retrieveFcmInstanceToken(token -> { final String androidId = PhoneHelper.getAndroidId(mXmppConnectionService); - IqPacket packet = mXmppConnectionService.getIqGenerator().pushTokenToAppServer(APP_SERVER, token, androidId); + final Jid appServer = Jid.of(mXmppConnectionService.getString(R.string.app_server)); + IqPacket packet = mXmppConnectionService.getIqGenerator().pushTokenToAppServer(appServer, token, androidId); mXmppConnectionService.sendIqPacket(account, packet, (a, p) -> { Element command = p.findChild("command", "http://jabber.org/protocol/commands"); if (p.getType() == IqPacket.TYPE.RESULT && command != null) { diff --git a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java index d45ded454..816d11118 100644 --- a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java +++ b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java @@ -3,6 +3,9 @@ package de.pixart.messenger.services; import android.content.Intent; import android.util.Log; +import com.google.firebase.messaging.FirebaseMessagingService; +import com.google.firebase.messaging.RemoteMessage; + import java.util.Map; import de.pixart.messenger.Config; |