From b3498a6c2edade76e30abd2125eda9de89dc0647 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Tue, 2 Aug 2016 21:35:51 +0200 Subject: [PATCH] Small changes, wanna pull --- .../dfa/diaspora_android/activity/MainActivity.java | 4 ++-- .../dfa/diaspora_android/ui/ContextMenuWebView.java | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index b6c79772..72444812 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -506,7 +506,7 @@ public class MainActivity extends AppCompatActivity @Override protected void onResume() { super.onResume(); - registerReceiver(brLoadUrl, new IntentFilter(URL_MESSAGE)); + //registerReceiver(brLoadUrl, new IntentFilter(URL_MESSAGE)); LocalBroadcastManager.getInstance(this).registerReceiver(brSetTitle, new IntentFilter(ACTION_UPDATE_TITLE_FROM_URL)); } @@ -571,7 +571,7 @@ public class MainActivity extends AppCompatActivity @Override protected void onPause() { - unregisterReceiver(brLoadUrl); + //unregisterReceiver(brLoadUrl); LocalBroadcastManager.getInstance(this).unregisterReceiver(brSetTitle); super.onPause(); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java index 80c2ab2d..13f6c05a 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/ContextMenuWebView.java @@ -44,6 +44,7 @@ import com.github.dfa.diaspora_android.activity.MainActivity; import com.github.dfa.diaspora_android.task.ImageDownloadTask; import java.io.File; +import java.sql.Time; /** * Subclass of WebView which adds a context menu for long clicks on images or links to share, save @@ -112,7 +113,7 @@ public class ContextMenuWebView extends NestedWebView { Uri source = Uri.parse(url); DownloadManager.Request request = new DownloadManager.Request(source); File destinationFile = new File(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/" - + source.getLastPathSegment()); + + System.currentTimeMillis()+".png"); request.setDestinationUri(Uri.fromFile(destinationFile)); ((DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE)).enqueue(request); Toast.makeText(context, context.getText(R.string.toast_saved_image_to_location) + " " + @@ -124,15 +125,15 @@ public class ContextMenuWebView extends NestedWebView { case ID_SHARE_IMAGE: if(url != null) { - final Uri source = Uri.parse(url); - final Uri local = Uri.parse(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/"+source.getLastPathSegment()); + final Uri local = Uri.parse(Environment.getExternalStorageDirectory() + "/Pictures/Diaspora/"+System.currentTimeMillis()+".png"); new ImageDownloadTask(null, local.getPath()) { @Override protected void onPostExecute(Bitmap result) { Uri myUri= Uri.fromFile(new File(local.getPath())); - Intent sharingIntent = new Intent(Intent.ACTION_SEND); - sharingIntent.setType("image/*"); + Intent sharingIntent = new Intent(); + sharingIntent.setAction(Intent.ACTION_SEND); sharingIntent.putExtra(Intent.EXTRA_STREAM, myUri); + sharingIntent.setType("image/png"); sharingIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); context.startActivity(Intent.createChooser(sharingIntent, "Share image using")); }