Skip to content

Commit bf74b20

Browse files
Fix the share option not working in PostOptionsBottomSheetFragment in the anonymous mode.
1 parent 2aad223 commit bf74b20

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

app/src/main/java/ml/docilealligator/infinityforreddit/bottomsheetfragments/PostOptionsBottomSheetFragment.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,31 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
156156
});
157157
}
158158

159+
binding.shareTextViewPostOptionsBottomSheetFragment.setOnClickListener(view -> {
160+
Bundle bundle = new Bundle();
161+
bundle.putString(ShareBottomSheetFragment.EXTRA_POST_LINK, mPost.getPermalink());
162+
if (mPost.getPostType() != Post.TEXT_TYPE) {
163+
bundle.putInt(ShareBottomSheetFragment.EXTRA_MEDIA_TYPE, mPost.getPostType());
164+
switch (mPost.getPostType()) {
165+
case Post.IMAGE_TYPE:
166+
case Post.GIF_TYPE:
167+
case Post.LINK_TYPE:
168+
case Post.NO_PREVIEW_LINK_TYPE:
169+
bundle.putString(ShareBottomSheetFragment.EXTRA_MEDIA_LINK, mPost.getUrl());
170+
break;
171+
case Post.VIDEO_TYPE:
172+
bundle.putString(ShareBottomSheetFragment.EXTRA_MEDIA_LINK, mPost.getVideoDownloadUrl());
173+
break;
174+
}
175+
}
176+
bundle.putParcelable(ShareBottomSheetFragment.EXTRA_POST, mPost);
177+
ShareBottomSheetFragment shareBottomSheetFragment = new ShareBottomSheetFragment();
178+
shareBottomSheetFragment.setArguments(bundle);
179+
shareBottomSheetFragment.show(mBaseActivity.getSupportFragmentManager(), shareBottomSheetFragment.getTag());
180+
181+
dismiss();
182+
});
183+
159184
binding.addToPostFilterTextViewPostOptionsBottomSheetFragment.setOnClickListener(view -> {
160185
Intent intent = new Intent(mBaseActivity, PostFilterPreferenceActivity.class);
161186
intent.putExtra(PostFilterPreferenceActivity.EXTRA_POST, mPost);
@@ -184,31 +209,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
184209
dismiss();
185210
});
186211

187-
binding.shareTextViewPostOptionsBottomSheetFragment.setOnClickListener(view -> {
188-
Bundle bundle = new Bundle();
189-
bundle.putString(ShareBottomSheetFragment.EXTRA_POST_LINK, mPost.getPermalink());
190-
if (mPost.getPostType() != Post.TEXT_TYPE) {
191-
bundle.putInt(ShareBottomSheetFragment.EXTRA_MEDIA_TYPE, mPost.getPostType());
192-
switch (mPost.getPostType()) {
193-
case Post.IMAGE_TYPE:
194-
case Post.GIF_TYPE:
195-
case Post.LINK_TYPE:
196-
case Post.NO_PREVIEW_LINK_TYPE:
197-
bundle.putString(ShareBottomSheetFragment.EXTRA_MEDIA_LINK, mPost.getUrl());
198-
break;
199-
case Post.VIDEO_TYPE:
200-
bundle.putString(ShareBottomSheetFragment.EXTRA_MEDIA_LINK, mPost.getVideoDownloadUrl());
201-
break;
202-
}
203-
}
204-
bundle.putParcelable(ShareBottomSheetFragment.EXTRA_POST, mPost);
205-
ShareBottomSheetFragment shareBottomSheetFragment = new ShareBottomSheetFragment();
206-
shareBottomSheetFragment.setArguments(bundle);
207-
shareBottomSheetFragment.show(mBaseActivity.getSupportFragmentManager(), shareBottomSheetFragment.getTag());
208-
209-
dismiss();
210-
});
211-
212212
if (mPost.isHidden()) {
213213
binding.hidePostTextViewPostOptionsBottomSheetFragment.setText(R.string.action_unhide_post);
214214
} else {

app/src/main/java/ml/docilealligator/infinityforreddit/utils/ShareScreenshotUtils.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fun sharePostAsScreenshot(
119119
target: Target<Drawable>,
120120
isFirstResource: Boolean
121121
): Boolean {
122-
binding.imageViewSharedPost.setVisibility(View.GONE)
122+
binding.imageViewSharedPost.visibility = View.GONE
123123
measureView(binding.getRoot())
124124
shareScreenshot(baseActivity, getBitmapFromView(binding.getRoot()))
125125
return false
@@ -160,17 +160,21 @@ fun sharePostAsScreenshot(
160160
).into(binding.imageViewSharedPost)
161161
}
162162
return
163+
} else {
164+
binding.imageViewSharedPost.visibility = View.GONE
163165
}
164166
}
165167

166168
Post.NO_PREVIEW_LINK_TYPE -> {
167169
binding.contentTextViewSharedPost.text = post.url
168-
binding.imageViewSharedPost.setVisibility(View.GONE)
170+
binding.imageViewSharedPost.visibility = View.GONE
169171
}
170172

171173
else -> {
172-
binding.contentTextViewSharedPost.text = post.selfTextPlainTrimmed
173-
binding.imageViewSharedPost.setVisibility(View.GONE)
174+
if (post.selfTextPlainTrimmed != null && post.selfTextPlainTrimmed.isNotEmpty()) {
175+
binding.contentTextViewSharedPost.text = post.selfTextPlainTrimmed
176+
}
177+
binding.imageViewSharedPost.visibility = View.GONE
174178
}
175179
}
176180

0 commit comments

Comments
 (0)