Fixed crash when an upload is confirmed with no file selected

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ff846ef..cfee79d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -595,7 +595,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     dialog.dismiss();\r
                 }\r
             });\r
                     dialog.dismiss();\r
                 }\r
             });\r

-            builder.setNegativeButton(R.string.common_exit, new OnClickListener() {\r
+            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));\r
+            builder.setNegativeButton(message, new OnClickListener() {\r

                 public void onClick(DialogInterface dialog, int which) {\r
                     dialog.dismiss();\r
                     finish();\r
                 public void onClick(DialogInterface dialog, int which) {\r
                     dialog.dismiss();\r
                     finish();\r


@@ -611,7 +612,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r

-                builder.setMessage(String.format(getString(R.string.about_message), pkg.versionName));\r
+                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));\r

                 builder.setIcon(android.R.drawable.ic_menu_info_details);\r
                 dialog = builder.create();\r
             } catch (NameNotFoundException e) {\r
                 builder.setIcon(android.R.drawable.ic_menu_info_details);\r
                 dialog = builder.create();\r
             } catch (NameNotFoundException e) {\r