Skip to content

Commit

Permalink
Allow choosing folders on external storage with Android 4.4+ (fixes #29…
Browse files Browse the repository at this point in the history 
…).
  • Loading branch information
@Nutomic
Nutomic committed Oct 22, 2014
1 parent 7db845a commit c82cdd4
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 29 deletions.
96 changes: 74 additions & 22 deletions src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
View file
Expand Up @@ -9,7 +9,6 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.IBinder;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
Expand All @@ -26,6 +25,7 @@

import java.io.File;
import java.io.FileFilter;
import java.util.ArrayList;
import java.util.Arrays;

/**
Expand All @@ -42,8 +42,15 @@ public class FolderPickerActivity extends SyncthingActivity

private ListView mListView;

private FileAdapter mAdapter;
private FileAdapter mFilesAdapter;

private RootsAdapter mRootsAdapter;

private ArrayList<File> mRootDirectories = new ArrayList();

/**
* Location of null means that the list of roots is displayed.
*/
private File mLocation;

@Override
Expand All @@ -56,11 +63,24 @@ protected void onCreate(Bundle savedInstanceState) {
mListView = (ListView) findViewById(android.R.id.list);
mListView.setOnItemClickListener(this);
mListView.setEmptyView(findViewById(android.R.id.empty));
mAdapter = new FileAdapter(this);
mListView.setAdapter(mAdapter);
mFilesAdapter = new FileAdapter(this);
mRootsAdapter = new RootsAdapter(this);
mListView.setAdapter(mFilesAdapter);

mLocation = new File(getIntent().getStringExtra(EXTRA_INITIAL_DIRECTORY));
refresh();
// Populate roots.
if (android.os.Build.VERSION.SDK_INT >= 19) {
mRootDirectories.addAll(Arrays.asList(getExternalFilesDirs(null)));
}
mRootDirectories.add(Environment.getExternalStorageDirectory());
for (File f : mRootDirectories) {
mRootsAdapter.add(f);
}

if (getIntent().hasExtra(EXTRA_INITIAL_DIRECTORY)) {
displayFolder(new File(getIntent().getStringExtra(EXTRA_INITIAL_DIRECTORY)));
} else {
displayRoot();
}
}

@Override
Expand Down Expand Up @@ -123,15 +143,15 @@ public void onShow(DialogInterface dialogInterface) {
private void createFolder(String name) {
File newFolder = new File(mLocation, name);
newFolder.mkdir();
mLocation = newFolder;
refresh();
displayFolder(newFolder);
}

/**
* Refreshes the ListView to show the contents of the folder in {@code }mLocation.peek()}.
*/
private void refresh() {
mAdapter.clear();
private void displayFolder(File folder) {
mLocation = folder;
mFilesAdapter.clear();
File[] contents = mLocation.listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
Expand All @@ -140,14 +160,15 @@ public boolean accept(File file) {
});
Arrays.sort(contents);
for (File f : contents) {
mAdapter.add(f);
mFilesAdapter.add(f);
}
mListView.setAdapter(mFilesAdapter);
}

@Override
public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
mLocation = mAdapter.getItem(i);
refresh();
ArrayAdapter<File> adapter = (ArrayAdapter<File>) mListView.getAdapter();
displayFolder(adapter.getItem(i));
}

private class FileAdapter extends ArrayAdapter<File> {
Expand All @@ -158,23 +179,40 @@ public FileAdapter(Context context) {

@Override
public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
LayoutInflater inflater = (LayoutInflater) getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
convertView = inflater.inflate(android.R.layout.simple_list_item_1, parent, false);
}

convertView = super.getView(position, convertView, parent);
TextView title = (TextView) convertView.findViewById(android.R.id.text1);
title.setText(getItem(position).getName());
return convertView;
}
}

private class RootsAdapter extends ArrayAdapter<File> {

public RootsAdapter(Context context) {
super(context, android.R.layout.simple_list_item_1);
}

@Override
public View getView(int position, View convertView, ViewGroup parent) {
convertView = super.getView(position, convertView, parent);
TextView title = (TextView) convertView.findViewById(android.R.id.text1);
title.setText(getItem(position).getAbsolutePath());
return convertView;
}
}

/**
* Goes up a directory, up to the list of roots if there are multiple roots.
*
* If we already are in the list of roots, or if we are directly in the only
* root folder, we cancel.
*/
@Override
public void onBackPressed() {
if (!mLocation.equals(Environment.getExternalStorageDirectory())) {
mLocation = mLocation.getParentFile();
refresh();
if (!mRootDirectories.contains(mLocation) && mLocation != null) {
displayFolder(mLocation.getParentFile());
} else if (mRootDirectories.contains(mLocation) && mRootDirectories.size() > 1) {
displayRoot();
} else {
setResult(Activity.RESULT_CANCELED);
finish();
Expand All @@ -190,4 +228,18 @@ public void onApiChange(SyncthingService.State currentState) {
}
}

/**
* Displays a list of all available roots, or if there is only one root, the
* contents of that folder.
*/
private void displayRoot() {
mFilesAdapter.clear();
if (mRootDirectories.size() == 1) {
displayFolder(mRootDirectories.get(0));
} else {
mListView.setAdapter(mRootsAdapter);
mLocation = null;
}
}

}
11 changes: 4 additions & 7 deletions src/main/java/com/nutomic/syncthingandroid/fragments/FolderSettingsFragment.java
View file
Expand Up @@ -5,7 +5,6 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Environment;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.Preference;
Expand Down Expand Up @@ -292,12 +291,10 @@ public boolean onPreferenceChange(Preference preference, Object o) {
@Override
public boolean onPreferenceClick(Preference preference) {
if (preference.equals(mDirectory)) {
Intent intent = new Intent(getActivity(), FolderPickerActivity.class)
.putExtra(FolderPickerActivity.EXTRA_INITIAL_DIRECTORY,
(mFolder.Path.length() != 0)
? mFolder.Path
: Environment.getExternalStorageDirectory().getAbsolutePath()
);
Intent intent = new Intent(getActivity(), FolderPickerActivity.class);
if (mFolder.Path.length() > 0) {
intent.putExtra(FolderPickerActivity.EXTRA_INITIAL_DIRECTORY, mFolder.Path);
}
startActivityForResult(intent, DIRECTORY_REQUEST_CODE);
} else if (preference.equals(mDevices) && mSyncthingService.getApi().getDevices().isEmpty()) {
Toast.makeText(getActivity(), R.string.no_devices, Toast.LENGTH_SHORT)
Expand Down

0 comments on commit c82cdd4

Please sign in to comment.