Avoid repetition of home path constant

This commit is contained in:
Fredrik Fornwall
2016-04-11 14:12:21 +02:00
parent c8af974852
commit 906ff24e76

View File

@@ -1,6 +1,5 @@
package com.termux.filepicker; package com.termux.filepicker;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.ListActivity; import android.app.ListActivity;
import android.content.Intent; import android.content.Intent;
@@ -12,6 +11,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import com.termux.R; import com.termux.R;
import com.termux.app.TermuxService;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@@ -23,9 +23,6 @@ import java.util.List;
/** Activity allowing picking files from the $HOME folder. */ /** Activity allowing picking files from the $HOME folder. */
public class TermuxFilePickerActivity extends ListActivity { public class TermuxFilePickerActivity extends ListActivity {
@SuppressLint("SdCardPath")
final String TERMUX_HOME = "/data/data/com.termux/files/home";
private File mCurrentDirectory; private File mCurrentDirectory;
private final List<File> mFiles = new ArrayList<>(); private final List<File> mFiles = new ArrayList<>();
private final List<String> mFileNames = new ArrayList<>(); private final List<String> mFileNames = new ArrayList<>();
@@ -38,7 +35,7 @@ public class TermuxFilePickerActivity extends ListActivity {
mAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, mFileNames); mAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, mFileNames);
enterDirectory(new File(TERMUX_HOME)); enterDirectory(new File(TermuxService.HOME_PATH));
setListAdapter(mAdapter); setListAdapter(mAdapter);
} }
@@ -69,11 +66,11 @@ public class TermuxFilePickerActivity extends ListActivity {
} }
void enterDirectory(File directory) { void enterDirectory(File directory) {
getActionBar().setDisplayHomeAsUpEnabled(!directory.getAbsolutePath().equals(TERMUX_HOME)); getActionBar().setDisplayHomeAsUpEnabled(!directory.getAbsolutePath().equals(TermuxService.HOME_PATH));
String title = directory.getAbsolutePath() + "/"; String title = directory.getAbsolutePath() + "/";
if (title.startsWith(TERMUX_HOME)) { if (title.startsWith(TermuxService.HOME_PATH)) {
title = "~" + title.substring(TERMUX_HOME.length(), title.length()); title = "~" + title.substring(TermuxService.HOME_PATH.length(), title.length());
} }
setTitle(title); setTitle(title);