diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java index 9ca8878288..e3009f7510 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java @@ -223,11 +223,9 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter eventListener.onStickerPackUninstallClicked(stickerPack.getPackId(), stickerPack.getPackKey())); - if (FeatureFlags.STICKERS_SHARING) { - shareButton.setVisibility(View.VISIBLE); - shareButtonImage.setVisibility(View.VISIBLE); - shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey())); - } + shareButton.setVisibility(View.VISIBLE); + shareButtonImage.setVisibility(View.VISIBLE); + shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey())); } else { actionButtonImage.setImageResource(R.drawable.ic_arrow_down); actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.getPackId(), stickerPack.getPackKey())); @@ -237,11 +235,6 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter eventListener.onStickerPackClicked(stickerPack.getPackId(), stickerPack.getPackKey())); } diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java index 3f4b5abf83..b94f1e6a57 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java @@ -148,9 +148,7 @@ public final class StickerPackPreviewActivity extends PassphraseRequiredActionBa if (manifest.isPresent()) { presentManifest(manifest.get().getManifest()); presentButton(manifest.get().isInstalled()); - if (FeatureFlags.STICKERS_SHARING) { - presentShareButton(manifest.get().isInstalled(), manifest.get().getManifest().getPackId(), manifest.get().getManifest().getPackKey()); - } + presentShareButton(manifest.get().isInstalled(), manifest.get().getManifest().getPackId(), manifest.get().getManifest().getPackKey()); } else { presentError(); } diff --git a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java index 1edeccd4fe..57455c98e6 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; */ public class StickerUrl { - private static final Pattern STICKER_URL_PATTERN = Pattern.compile("^https://signal\\.org/addstickers/#pack_id=(.*)&pack_key=(.*)$"); + private static final Pattern STICKER_URL_PATTERN = Pattern.compile("^https://signal\\.art/addstickers/#pack_id=(.*)&pack_key=(.*)$"); public static Optional> parseActionUri(@Nullable Uri uri) { if (uri == null) return Optional.absent(); @@ -59,7 +59,7 @@ public class StickerUrl { } public static String createShareLink(@NonNull String packId, @NonNull String packKey) { - return "https://signal.org/addstickers/#pack_id=" + packId + "&pack_key=" + packKey; + return "https://signal.art/addstickers/#pack_id=" + packId + "&pack_key=" + packKey; } private static boolean isValidHex(String value) { diff --git a/src/org/thoughtcrime/securesms/util/FeatureFlags.java b/src/org/thoughtcrime/securesms/util/FeatureFlags.java index ef07431440..504069f0ae 100644 --- a/src/org/thoughtcrime/securesms/util/FeatureFlags.java +++ b/src/org/thoughtcrime/securesms/util/FeatureFlags.java @@ -5,9 +5,6 @@ package org.thoughtcrime.securesms.util; * After a feature has been launched, the flag should be removed. */ public class FeatureFlags { - /** Support for sharing stickers. */ - public static final boolean STICKERS_SHARING = false; - /** Send support for view-once photos. */ public static final boolean VIEW_ONCE_SENDING = false; }