From: tobiasKaminsky Date: Sun, 25 Oct 2015 11:50:54 +0000 (+0100) Subject: wip X-Git-Tag: beta-20151122~53^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/9826f99c41c0685ee15540b4544997c8da8c0eb4?ds=inline;hp=--cc wip --- 9826f99c41c0685ee15540b4544997c8da8c0eb4 diff --git a/res/values/strings.xml b/res/values/strings.xml index 2c101ae0..9173f069 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -366,5 +366,6 @@ %1$d files, 1 folder %1$d files, %2$d folders Stream file with external player + May expose password? diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index db64610a..15fad667 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -217,15 +217,16 @@ public class MediaService extends Service implements OnCompletionListener, OnPre public static AlertDialog.Builder streamWithExternalApp(final String uri, final Activity activity){ AlertDialog.Builder builder = new AlertDialog.Builder(activity); - builder.setMessage("May expose password?") - .setPositiveButton("Stream", new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - Intent i = new Intent(android.content.Intent.ACTION_VIEW); - i.setData(Uri.parse(uri)); - activity.startActivity(i); - } - }) - .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setMessage(activity.getString(R.string.stream_expose_password)) + .setPositiveButton(activity.getString(R.string.common_yes), + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(uri)); + activity.startActivity(i); + } + }) + .setNegativeButton(activity.getString(R.string.common_no), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // User cancelled the dialog }