Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	plugin.xml
#	src/android/nl/xservices/plugins/SocialSharing.java
  • Loading branch information
EddyVerbruggen committed Jun 1, 2016
1 parent aa712fa commit 24c0f3d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/android/nl/xservices/plugins/SocialSharing.java
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ private void showPasteMessage(String label) {
private Uri getFileUriAndSetType(Intent sendIntent, String dir, String image, String subject, int nthFile, URI currentPageURI) throws IOException {
// we're assuming an image, but this can be any filetype you like
String localImage = image;
if( image.endsWith("mp4") || image.endsWith("mov") || image.endsWith("3gp") ){
if (image.endsWith("mp4") || image.endsWith("mov") || image.endsWith("3gp") ){
sendIntent.setType("video/*");
} else {
sendIntent.setType("image/*");
Expand Down

0 comments on commit 24c0f3d

Please sign in to comment.