Skip to content

Remember last share location #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
magsjoq wants to merge 9 commits into from
Closed

Remember last share location #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ebe0f73
Added feature for remembering last upload location when sharing a fil…
magsjoq Oct 8, 2014
dd80754
Fixed merge
magsjoq Oct 10, 2014
4275f02
Fixed imports and added comments
Pro9 Oct 10, 2014
8962702
Added check for that the last upload folder still exists
magsjoq Oct 14, 2014
b6c7719
Merge with develop
magsjoq Oct 17, 2014
8447900
Merge with develop
magsjoq Oct 20, 2014
dedd5bb
Fixed log import
magsjoq Oct 20, 2014
2b1865d
Removes translations
magsjoq Oct 21, 2014
52bf54a
Removes remember last share location setting
magsjoq Oct 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
<string name="prefs_recommend">Recommend to a friend</string>
<string name="prefs_feedback">Feedback</string>
<string name="prefs_imprint">Imprint</string>

<string name="prefs_remember_last_share_location">Remember share location</string>
<string name="prefs_remember_last_upload_location_summary">Remember last share upload location</string>

<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>

Expand Down Expand Up @@ -271,6 +273,7 @@
<string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
<string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>

<string name="empty"></string>

<string name="forbidden_permissions">You do not have permission %s</string>
Expand Down Expand Up @@ -305,5 +308,4 @@

<string name="prefs_category_instant_uploading">Instant Uploads</string>
<string name="prefs_category_security">Security</string>

</resources>
87 changes: 75 additions & 12 deletions src/com/owncloud/android/ui/activity/Uploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,37 +39,56 @@
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.app.ListActivity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.provider.MediaStore.Audio;
import android.provider.MediaStore.Images;
import android.provider.MediaStore.Video;
import android.view.View;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Button;
import android.widget.EditText;
import android.widget.SimpleAdapter;
import android.widget.Toast;

import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockListActivity;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.authentication.AccountAuthenticator;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.files.services.FileUploader;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.lib.common.utils.Log_OC;

import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
import java.util.Vector;


/**
* This can be used to upload things to an ownCloud instance.
*
* @author Bartek Przybylski
*
*/
public class Uploader extends ListActivity implements OnItemClickListener, android.view.View.OnClickListener {
public class Uploader extends SherlockListActivity implements OnItemClickListener, android.view.View.OnClickListener {
private static final String TAG = "ownCloudUploader";

private Account mAccount;
Expand All @@ -91,9 +110,11 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getWindow().requestFeature(Window.FEATURE_NO_TITLE);
mParents = new Stack<String>();
mParents.add("");

ActionBar actionBar = getSherlock().getActionBar();
actionBar.setIcon(DisplayUtils.getSeasonalIconId());

if (prepareStreamsToUpload()) {
mAccountManager = (AccountManager) getSystemService(Context.ACCOUNT_SERVICE);
Account[] accounts = mAccountManager.getAccountsByType(MainApp.getAccountType());
Expand All @@ -104,10 +125,31 @@ protected void onCreate(Bundle savedInstanceState) {
Log_OC.i(TAG, "More then one ownCloud is available");
showDialog(DIALOG_MULTIPLE_ACCOUNT);
} else {
mAccount = accounts[0];
mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());
populateDirectoryList();

mAccount = accounts[0];
mStorageManager = new FileDataStorageManager(mAccount, getContentResolver());

SharedPreferences appPreferences = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext());

String last_path = appPreferences.getString("last_upload_path", "");
// "/" equals root-directory
if(last_path.equals("/")) {
mParents.add("");
}
else{
String[] dir_names = last_path.split("/");
for (String dir : dir_names)
mParents.add(dir);
}
//Make sure that path still exists, if it doesn't pop the stack and try the previous path
while(!mStorageManager.fileExists(generatePath(mParents))){
mParents.pop();
}
}

populateDirectoryList();

} else {
showDialog(DIALOG_NO_STREAM);
}
Expand Down Expand Up @@ -288,12 +330,18 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
private void populateDirectoryList() {
setContentView(R.layout.uploader_layout);

String full_path = "";
for (String a : mParents)
full_path += a + "/";
String current_dir = mParents.peek();
if(current_dir.equals("")){
getActionBar().setTitle(getString(R.string.default_display_name_for_root_folder));
}
else{
getActionBar().setTitle(current_dir);
}

String full_path = generatePath(mParents);

Log_OC.d(TAG, "Populating view with content of : " + full_path);

mFile = mStorageManager.getFileByPath(full_path);
if (mFile != null) {
Vector<OCFile> files = mStorageManager.getFolderContent(mFile);
Expand All @@ -317,6 +365,14 @@ private void populateDirectoryList() {
}
}

private String generatePath(Stack<String> dirs) {
String full_path = "";

for (String a : dirs)
full_path += a + "/";
return full_path;
}

private boolean prepareStreamsToUpload() {
if (getIntent().getAction().equals(Intent.ACTION_SEND)) {
mStreamsToUpload = new ArrayList<Parcelable>();
Expand Down Expand Up @@ -408,6 +464,13 @@ else if (mimeType.contains("audio")) {
intent.putExtra(FileUploader.KEY_REMOTE_FILE, remote.toArray(new String[remote.size()]));
intent.putExtra(FileUploader.KEY_ACCOUNT, mAccount);
startService(intent);

//Save the path to shared preferences
SharedPreferences.Editor appPrefs = PreferenceManager
.getDefaultSharedPreferences(getApplicationContext()).edit();
appPrefs.putString("last_upload_path", mUploadPath);
appPrefs.apply();

finish();
}

Expand Down