Merge pull request #453 from owncloud/improve_action_bar_pr_392_with_develop

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

diff --git a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
index 01a9739..33432cf 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/FailedUploadActivity.java
@@ -1,5 +1,24 @@
+/* ownCloud Android client application\r
+ *   Copyright (C) 2012-2013 ownCloud Inc.\r
+ *\r
+ *   This program is free software: you can redistribute it and/or modify\r
+ *   it under the terms of the GNU General Public License version 2,\r
+ *   as published by the Free Software Foundation.\r
+ *\r
+ *   This program is distributed in the hope that it will be useful,\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ *   GNU General Public License for more details.\r
+ *\r
+ *   You should have received a copy of the GNU General Public License\r
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ */\r
+\r

 package com.owncloud.android.ui.activity;\r
 \r
 package com.owncloud.android.ui.activity;\r
 \r

+import com.owncloud.android.R;\r
+\r

 import android.app.Activity;\r
 import android.os.Bundle;\r
 import android.view.View;\r
 import android.app.Activity;\r
 import android.os.Bundle;\r
 import android.view.View;\r


@@ -7,25 +26,13 @@ import android.view.View.OnClickListener;
 import android.widget.Button;\r
 import android.widget.TextView;\r
 \r
 import android.widget.Button;\r
 import android.widget.TextView;\r
 \r

-import com.owncloud.android.R;\r

 \r
 /**\r
  * This Activity is used to display a detail message for failed uploads\r
  * \r
  * The entry-point for this activity is the 'Failed upload Notification"\r
  * \r
 \r
 /**\r
  * This Activity is used to display a detail message for failed uploads\r
  * \r
  * The entry-point for this activity is the 'Failed upload Notification"\r
  * \r

- * \r

  * @author andomaex / Matthias Baumann\r
  * @author andomaex / Matthias Baumann\r

- * \r
- *         This program is free software: you can redistribute it and/or modify\r
- *         it under the terms of the GNU General Public License as published by\r
- *         the Free Software Foundation, either version 3 of the License, or (at\r
- *         your option) any later version.\r
- * \r
- *         This program is distributed in the hope that it will be useful, but\r
- *         WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *         MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
- *         General Public License for more de/\r

  */\r
 public class FailedUploadActivity extends Activity {\r
 \r
  */\r
 public class FailedUploadActivity extends Activity {\r
 \r


@@ -38,8 +45,9 @@ public class FailedUploadActivity extends Activity {
         String message = getIntent().getStringExtra(MESSAGE);\r
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);\r
         textView.setText(message);\r
         String message = getIntent().getStringExtra(MESSAGE);\r
         TextView textView = (TextView) findViewById(R.id.faild_upload_message);\r
         textView.setText(message);\r

-        Button close_button = (Button) findViewById(R.id.failed_uploadactivity_close_button);\r
-        close_button.setOnClickListener(new OnClickListener() {\r
+        Button closeBtn = (Button) findViewById(R.id.failed_uploadactivity_close_button);\r
+        \r
+        closeBtn.setOnClickListener(new OnClickListener() {\r

             @Override\r
             public void onClick(View v) {\r
                 finish();\r
             @Override\r
             public void onClick(View v) {\r
                 finish();\r