From 967e9dd9a76dbc235394ad2a025a3b8de1a49477 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 7 Jun 2019 15:44:05 -0400 Subject: [PATCH] Disable sticker pack sharing. --- .../securesms/stickers/StickerManagementAdapter.java | 11 ++++++++--- .../stickers/StickerPackPreviewActivity.java | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java index 49f61d8dfe..a5b121995e 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java @@ -265,9 +265,10 @@ final class StickerManagementAdapter extends RecyclerView.Adapter { actionButtonImage.setImageResource(R.drawable.ic_x); actionButton.setOnClickListener(v -> eventListener.onStickerPackUninstallClicked(stickerPack.getPackId(), stickerPack.getPackKey())); - shareButton.setVisibility(View.VISIBLE); - shareButtonImage.setVisibility(View.VISIBLE); - shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey())); + // TODO [Stickers]: Re-enable later +// 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())); @@ -277,6 +278,10 @@ final class StickerManagementAdapter extends RecyclerView.Adapter { shareButton.setOnClickListener(null); } + // TODO [Stickers]: Delete later + shareButton.setVisibility(View.GONE); + shareButtonImage.setVisibility(View.GONE); + itemView.setOnClickListener(v -> 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 17b4dbfe14..794455b797 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java @@ -78,7 +78,7 @@ public final class StickerPackPreviewActivity extends PassphraseRequiredActionBa if (!stickerParams.isPresent()) { Log.w(TAG, "Invalid URI!"); - finish(); + presentError(); return; } @@ -147,7 +147,8 @@ public final class StickerPackPreviewActivity extends PassphraseRequiredActionBa if (manifest.isPresent()) { presentManifest(manifest.get().getManifest()); presentButton(manifest.get().isInstalled()); - presentShareButton(manifest.get().isInstalled(), manifest.get().getManifest().getPackId(), manifest.get().getManifest().getPackKey()); + // TODO [Stickers]: Re-enable later +// presentShareButton(manifest.get().isInstalled(), manifest.get().getManifest().getPackId(), manifest.get().getManifest().getPackKey()); } else { presentError(); }