blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable sticker sharing.

master
Greyson Parrelli 2019-09-20 18:13:57 -04:00
parent de03706d8d
commit 9d14bcb808
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
View File

@ -223,11 +223,9 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
actionButtonImage.setImageResource(R.drawable.ic_x);
actionButton.setOnClickListener(v -> 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<String
shareButton.setOnClickListener(null);
}
if (!FeatureFlags.STICKERS_SHARING) {
shareButton.setVisibility(View.GONE);
shareButtonImage.setVisibility(View.GONE);
}
itemView.setOnClickListener(v -> eventListener.onStickerPackClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
}

4
src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
View File

@ -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();
}

4
src/org/thoughtcrime/securesms/stickers/StickerUrl.java
View File

@ -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<Pair<String, String>> 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) {

3
src/org/thoughtcrime/securesms/util/FeatureFlags.java
View File

@ -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;
}