Commit 882c1bf6 authored by Thomas's avatar Thomas
Browse files

Merge pull request 'Bump android-embedded_fcm_distributor to 2.1.3' (#320)... 

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
parents 054a8f4c 3130d7b8

app/build.gradle

+6 −2
Original line number Diff line number Diff line
@@ -115,9 +115,13 @@ dependencies { 
    implementation "ch.acra:acra-dialog:5.9.6"



    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'

    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 'androidx.multidex:multidex:2.0.1'

    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'

app/src/playstore/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
            android:enabled="true"

            android:exported="false">

            <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.UNREGISTER" />

            </intent-filter>

app/src/playstore/java/app/fedilab/android/services/EmbeddedDistrib.java

+8 −3
Original line number Diff line number Diff line 
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;



public class EmbeddedDistrib extends EmbeddedDistributorReceiver {

    public EmbeddedDistrib() {

        super(new HandlerFCM());

    @Override

    public @NotNull String getEndpoint(@Nullable Context context, @NotNull String token, @NotNull String instance) {

        return "https://gotify.fedilab.app/FCM?token=" + token + "&instance=" + instance;

    }



}
 
 No newline at end of file

app/src/playstore/java/app/fedilab/android/services/HandlerFCM.java

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
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;

    }



}
 
 No newline at end of file