Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request 'Bump android-embedded_fcm_distributor to 2.1.3' (#320) from s1m/Fedilab:bump/unifiedpush into main 

Reviewed-on: https://codeberg.org/tom79/Fedilab/pulls/320
This commit is contained in:
Thomas 2022-09-10 15:22:01 +02:00
parent 054a8f4cc0 3130d7b827
commit 882c1bf6cd
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -115,9 +115,13 @@ dependencies {
implementation "ch.acra:acra-dialog:5.9.6" implementation "ch.acra:acra-dialog:5.9.6"
implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0" implementation "com.madgag.spongycastle:bctls-jdk15on:1.58.0.0"
implementation 'com.github.UnifiedPush:android-connector:2.0.0' implementation 'com.github.UnifiedPush:android-connector:2.0.1'
// implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1' // implementation 'com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta1'
playstoreImplementation 'com.github.UnifiedPush:android-embedded_fcm_distributor:1.1.0' playstoreImplementation ('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.3') {
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
}
implementation 'com.burhanrashid52:photoeditor:1.5.1' implementation 'com.burhanrashid52:photoeditor:1.5.1'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

1
app/src/playstore/AndroidManifest.xml
View File

@ -10,6 +10,7 @@
android:enabled="true" android:enabled="true"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="org.unifiedpush.android.distributor.feature.BYTES_MESSAGE"/>
<action android:name="org.unifiedpush.android.distributor.REGISTER" /> <action android:name="org.unifiedpush.android.distributor.REGISTER" />
<action android:name="org.unifiedpush.android.distributor.UNREGISTER" /> <action android:name="org.unifiedpush.android.distributor.UNREGISTER" />
</intent-filter> </intent-filter>

11
app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java
View File

@ -1,11 +1,16 @@
package app.fedilab.android.services; package app.fedilab.android.services;
import android.content.Context;
import androidx.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver; import org.unifiedpush.android.embedded_fcm_distributor.EmbeddedDistributorReceiver;
public class EmbeddedDistrib extends EmbeddedDistributorReceiver { public class EmbeddedDistrib extends EmbeddedDistributorReceiver {
public EmbeddedDistrib() { @Override
super(new HandlerFCM()); public @NotNull String getEndpoint(@Nullable Context context, @NotNull String token, @NotNull String instance) {
return "https://gotify.fedilab.app/FCM?token=" + token + "&instance=" + instance;
} }
} }

18
app/src/playstore/java/app/fedilab/android/services/HandlerFCM.java
View File

@ -1,18 +0,0 @@
package app.fedilab.android.services;
import android.content.Context;
import androidx.annotation.Nullable;
import org.jetbrains.annotations.NotNull;
import org.unifiedpush.android.embedded_fcm_distributor.GetEndpointHandler;
public class HandlerFCM implements GetEndpointHandler {
@Override
public @NotNull String getEndpoint(@Nullable Context context, @NotNull String token, @NotNull String instance) {
return "https://gotify.fedilab.app/FCM?token=" + token + "&instance=" + instance;
}
}