From 0617115a6fc4a58a5870af5c3eaf5ca1358c803a Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Mon, 7 Sep 2015 15:20:48 -0400 Subject: export opml via intent --- .../antennapod/asynctask/OpmlExportWorker.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java index 6bba956a6..c9d82642e 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java @@ -5,6 +5,8 @@ import android.app.AlertDialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; import android.os.AsyncTask; import android.util.Log; @@ -76,26 +78,24 @@ public class OpmlExportWorker extends AsyncTask { @Override protected void onPostExecute(Void result) { progDialog.dismiss(); - AlertDialog.Builder alert = new AlertDialog.Builder(context) - .setNeutralButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.dismiss(); - } - }); if (exception != null) { + AlertDialog.Builder alert = new AlertDialog.Builder(context) + .setNeutralButton(android.R.string.ok, + (dialog, which) -> { + dialog.dismiss(); + }); alert.setTitle(R.string.export_error_label); alert.setMessage(exception.getMessage()); - } else { - alert.setTitle(R.string.opml_export_success_title); - alert.setMessage(context - .getString(R.string.opml_export_success_sum) - + output.toString()); + alert.create().show(); + return; } - alert.create().show(); + + Uri outputUri = Uri.fromFile(output); + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); + sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); + sendIntent.setType("text/plain"); + context.startActivity(Intent.createChooser(sendIntent, context.getResources().getText(R.string.share_label))); } @Override -- cgit v1.2.3 From de879e1dd92f74fce89b92c0d1e9744135d91128 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Mon, 7 Sep 2015 20:42:15 -0400 Subject: make share just an option of the old dialog --- .../antennapod/asynctask/OpmlExportWorker.java | 40 ++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java index c9d82642e..cd683de23 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java @@ -78,24 +78,36 @@ public class OpmlExportWorker extends AsyncTask { @Override protected void onPostExecute(Void result) { progDialog.dismiss(); - if (exception != null) { - AlertDialog.Builder alert = new AlertDialog.Builder(context) - .setNeutralButton(android.R.string.ok, - (dialog, which) -> { + AlertDialog.Builder alert = new AlertDialog.Builder(context) + .setNeutralButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, + int which) { dialog.dismiss(); - }); + } + }); + if (exception != null) { alert.setTitle(R.string.export_error_label); alert.setMessage(exception.getMessage()); - alert.create().show(); - return; + } else { + alert.setTitle(R.string.opml_export_success_title); + alert.setMessage(context + .getString(R.string.opml_export_success_sum) + + output.toString()) + .setPositiveButton(R.string.share_label, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) {Uri outputUri = Uri.fromFile(output); + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); + sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); + sendIntent.setType("text/plain"); + context.startActivity(Intent.createChooser(sendIntent, context.getResources().getText(R.string.share_label))); + } + }); } - - Uri outputUri = Uri.fromFile(output); - Intent sendIntent = new Intent(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); - sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); - sendIntent.setType("text/plain"); - context.startActivity(Intent.createChooser(sendIntent, context.getResources().getText(R.string.share_label))); + alert.create().show(); } @Override -- cgit v1.2.3 From 00b1badb3f965c68f48e7660f767e495a9773e92 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Mon, 7 Sep 2015 20:43:53 -0400 Subject: use lambda --- .../danoeh/antennapod/asynctask/OpmlExportWorker.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java index cd683de23..685004410 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java @@ -96,15 +96,14 @@ public class OpmlExportWorker extends AsyncTask { alert.setMessage(context .getString(R.string.opml_export_success_sum) + output.toString()) - .setPositiveButton(R.string.share_label, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) {Uri outputUri = Uri.fromFile(output); - Intent sendIntent = new Intent(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); - sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); - sendIntent.setType("text/plain"); - context.startActivity(Intent.createChooser(sendIntent, context.getResources().getText(R.string.share_label))); - } + .setPositiveButton(R.string.share_label, (dialog, which) -> { + Uri outputUri = Uri.fromFile(output); + Intent sendIntent = new Intent(Intent.ACTION_SEND); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); + sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); + sendIntent.setType("text/plain"); + context.startActivity(Intent.createChooser(sendIntent, + context.getResources().getText(R.string.share_label))); }); } alert.create().show(); -- cgit v1.2.3 From 159f1f6dcc9743462fd17a3fb5f435ecf14ee054 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Wed, 9 Sep 2015 17:23:53 -0400 Subject: changes the action title to Send... --- .../main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/de') diff --git a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java index 685004410..f12b0fe3a 100644 --- a/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java +++ b/app/src/main/java/de/danoeh/antennapod/asynctask/OpmlExportWorker.java @@ -96,14 +96,15 @@ public class OpmlExportWorker extends AsyncTask { alert.setMessage(context .getString(R.string.opml_export_success_sum) + output.toString()) - .setPositiveButton(R.string.share_label, (dialog, which) -> { + .setPositiveButton(R.string.send_label, (dialog, which) -> { Uri outputUri = Uri.fromFile(output); Intent sendIntent = new Intent(Intent.ACTION_SEND); - sendIntent.putExtra(Intent.EXTRA_SUBJECT, "OPML Export"); + sendIntent.putExtra(Intent.EXTRA_SUBJECT, + context.getResources().getText(R.string.opml_export_label)); sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri); sendIntent.setType("text/plain"); context.startActivity(Intent.createChooser(sendIntent, - context.getResources().getText(R.string.share_label))); + context.getResources().getText(R.string.send_label))); }); } alert.create().show(); -- cgit v1.2.3