Merge branch 'master' into task/update-feed-view

This commit is contained in:
Austin Huang 2020-09-03 12:00:20 -04:00 committed by GitHub
commit 0694cf02e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -84,7 +84,7 @@ public final class PostViewer extends BaseLanguageActivity {
private View viewsContainer, viewerCaptionParent; private View viewsContainer, viewerCaptionParent;
private GestureDetectorCompat gestureDetector; private GestureDetectorCompat gestureDetector;
private SwipeEvent swipeEvent; private SwipeEvent swipeEvent;
private CharSequence postCaption = null, postShortCode, postUserId; private CharSequence postCaption = null, postUserId;
private Resources resources; private Resources resources;
private boolean session = false, isFromShare, liked, saved, ok = false; private boolean session = false, isFromShare, liked, saved, ok = false;
private int slidePos = 0, lastSlidePos = 0; private int slidePos = 0, lastSlidePos = 0;
@ -698,7 +698,7 @@ public final class PostViewer extends BaseLanguageActivity {
Toast.makeText(getApplicationContext(), R.string.share_private_post, Toast.LENGTH_LONG).show(); Toast.makeText(getApplicationContext(), R.string.share_private_post, Toast.LENGTH_LONG).show();
Intent sharingIntent = new Intent(Intent.ACTION_SEND); Intent sharingIntent = new Intent(Intent.ACTION_SEND);
sharingIntent.setType("text/plain"); sharingIntent.setType("text/plain");
sharingIntent.putExtra(Intent.EXTRA_TEXT, "https://instagram.com/p/" + postShortCode); sharingIntent.putExtra(Intent.EXTRA_TEXT, "https://instagram.com/p/" + postModel.getShortCode());
startActivity(Intent.createChooser(sharingIntent, startActivity(Intent.createChooser(sharingIntent,
(result.isPrivate()) (result.isPrivate())
? getString(R.string.share_private_post) ? getString(R.string.share_private_post)
@ -783,4 +783,4 @@ public final class PostViewer extends BaseLanguageActivity {
Toast.makeText(getApplicationContext(), R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), R.string.downloader_unknown_error, Toast.LENGTH_SHORT).show();
} }
} }
} }