From 2ca34278f95e3e29b2b35bb1fed5684d3f1b8638 Mon Sep 17 00:00:00 2001 From: FineFindus <63370021+FineFindus@users.noreply.github.com> Date: Fri, 18 Aug 2023 18:15:57 +0200 Subject: [PATCH] build: add F-Droid flavor (#760) * build: add fdroid flavor * feat: disable fcm registration in f-droid flavor --- mastodon/build.gradle | 1 + .../joinmastodon/android/api/PushSubscriptionManager.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/mastodon/build.gradle b/mastodon/build.gradle index b03de8998..93c52124f 100644 --- a/mastodon/build.gradle +++ b/mastodon/build.gradle @@ -34,6 +34,7 @@ android { } githubRelease { initWith release } playRelease { initWith release } + fdroidRelease { initWith release } } compileOptions { sourceCompatibility JavaVersion.VERSION_17 diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java index 28c17e0bc..4633eec64 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -122,6 +122,12 @@ public class PushSubscriptionManager{ public void registerAccountForPush(PushSubscription subscription){ + // this function is used for registering push notifications using FCM + // to avoid NonFreeNet in F-Droid, this registration is disabled in it + // see https://github.com/LucasGGamerM/moshidon/issues/206 for more context + if(BuildConfig.BUILD_TYPE.equals("fdroidRelease")) + return; + if(TextUtils.isEmpty(deviceToken)) throw new IllegalStateException("No device push token available"); String endpoint = "https://app.joinmastodon.org/relay-to/fcm/"+deviceToken+"/"+accountID;