vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-25 13:52:08 +01:00
Code Issues Releases Wiki Activity

Fixed image sharing to other apps

Browse source
This commit is contained in:
vanitasvitae 2016-10-02 12:42:12 +02:00
parent d8cbe480ad
commit 036457117c
2 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/github/dfa/diaspora_android/fragment/BrowserFragment.java
View file

@ -104,6 +104,8 @@ public class BrowserFragment extends CustomFragment {
pendingUrl = null; pendingUrl = null;
} }
webView.setParentActivity(getActivity());
this.setRetainInstance(true); this.setRetainInstance(true);
} }

26
app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java
View file

@ -123,6 +123,30 @@ public class ContextMenuWebView extends NestedWebView {
case ID_SHARE_IMAGE: case ID_SHARE_IMAGE:
if (url != null) { if (url != null) {
boolean writeToStoragePermitted = true;
if (android.os.Build.VERSION.SDK_INT >= 23) {
int hasWRITE_EXTERNAL_STORAGE = parentActivity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
writeToStoragePermitted = false;
if (!parentActivity.shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
new AlertDialog.Builder(parentActivity)
.setMessage(R.string.permissions_image)
.setPositiveButton(context.getText(android.R.string.yes), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (android.os.Build.VERSION.SDK_INT >= 23)
parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
}
})
.setNegativeButton(context.getText(android.R.string.no), null)
.show();
}
parentActivity.requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
MainActivity.REQUEST_CODE__ACCESS_EXTERNAL_STORAGE);
}
}
if (writeToStoragePermitted) {
final Uri local = Uri.parse(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + System.currentTimeMillis() + ".png"); final Uri local = Uri.parse(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" + System.currentTimeMillis() + ".png");
new ImageDownloadTask(null, local.getPath()) { new ImageDownloadTask(null, local.getPath()) {
@Override @Override
@ -136,9 +160,11 @@ public class ContextMenuWebView extends NestedWebView {
context.startActivity(Intent.createChooser(sharingIntent, "Share image using")); context.startActivity(Intent.createChooser(sharingIntent, "Share image using"));
} }
}.execute(url); }.execute(url);
}
} else { } else {
Toast.makeText(context, "Cannot share image: url is null", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Cannot share image: url is null", Toast.LENGTH_SHORT).show();
} }
break; break;
case ID_IMAGE_EXTERNAL_BROWSER: case ID_IMAGE_EXTERNAL_BROWSER: