X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1435e8c40645f9e5855246f216348d83b4450432..700d4449779ee9702437103695a79a1cf7169e9c:/src/com/owncloud/android/ui/activity/UploadPathActivity.java

diff --git a/src/com/owncloud/android/ui/activity/UploadPathActivity.java b/src/com/owncloud/android/ui/activity/UploadPathActivity.java
index 4c524116..aa3b8aa2 100644
--- a/src/com/owncloud/android/ui/activity/UploadPathActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadPathActivity.java
@@ -18,10 +18,8 @@
 package com.owncloud.android.ui.activity;
 
 import android.accounts.Account;
-import android.content.Intent;
 
 import android.os.Bundle;
-import android.view.View;
 import android.view.View.OnClickListener;
 
 import com.owncloud.android.datamodel.OCFile;
@@ -33,7 +31,6 @@ public class UploadPathActivity extends FolderPickerActivity implements FileFrag
 
     public static final String KEY_INSTANT_UPLOAD_PATH = "INSTANT_UPLOAD_PATH";
 
-    public static final int RESULT_OK_SET_UPLOAD_PATH = 1;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -41,6 +38,7 @@ public class UploadPathActivity extends FolderPickerActivity implements FileFrag
 
         String instantUploadPath = getIntent().getStringExtra(KEY_INSTANT_UPLOAD_PATH);
 
+        // The caller activity (Preferences) is not a FileActivity, so it has no OCFile, only a path.
         OCFile folder = new OCFile(instantUploadPath);
 
         setFile(folder);
@@ -76,20 +74,4 @@ public class UploadPathActivity extends FolderPickerActivity implements FileFrag
             updateNavigationElementsInActionBar();
         }
     }
-
-    @Override
-    public void onClick(View v) {
-        if (v == mCancelBtn) {
-            finish();
-        } else if (v == mChooseBtn) {
-            Intent i = getIntent();
-            OCFile targetFile = (OCFile) i.getParcelableExtra(UploadPathActivity.EXTRA_TARGET_FILE);
-
-            Intent data = new Intent();
-            data.putExtra(EXTRA_CURRENT_FOLDER, getCurrentFolder());
-            data.putExtra(EXTRA_TARGET_FILE, targetFile);
-            setResult(RESULT_OK_SET_UPLOAD_PATH, data);
-            finish();
-        }
-    }
 }