empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Disable sticker pack sharing.

Browse source
This commit is contained in:
Greyson Parrelli 2019-06-07 15:44:05 -04:00
parent 4a720289e2
commit 967e9dd9a7
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
View file

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

5
src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
View file

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