Skip to content

Commit 8204552

Browse files
committed
do not replace the root folder with "home"
1 parent 35ce308 commit 8204552

File tree

7 files changed

+11
-17
lines changed

7 files changed

+11
-17
lines changed

app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,9 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
101101

102102
public void setInitialBreadcrumb(String fullPath) {
103103
final String basePath = Environment.getExternalStorageDirectory().toString();
104-
final String tempPath = fullPath.replace(basePath, getContext().getString(R.string.initial_breadcrumb) + "/");
105104
removeAllViewsInLayout();
106-
final String[] dirs = tempPath.split("/");
107-
String currPath = basePath;
105+
final String[] dirs = fullPath.split("/");
106+
String currPath = "/";
108107
for (int i = 0; i < dirs.length; i++) {
109108
final String dir = dirs[i];
110109
if (i > 0) {

app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
2424
@BindView(R.id.breadcrumbs) Breadcrumbs mBreadcrumbs;
2525

2626
private static final int STORAGE_PERMISSION = 1;
27+
private static int mRootFoldersCnt;
2728

2829
@Override
2930
protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +53,7 @@ private void initRootFileManager() {
5253
final String path = Environment.getExternalStorageDirectory().toString();
5354
openPath(path);
5455
mBreadcrumbs.setInitialBreadcrumb(path);
56+
mRootFoldersCnt = mBreadcrumbs.getChildCount();
5557
}
5658

5759
private void openPath(String path) {
@@ -87,10 +89,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
8789

8890
@Override
8991
public void onBackPressed() {
90-
final int cnt = getSupportFragmentManager().getBackStackEntryCount();
91-
if (cnt == 1)
92+
final int cnt = mBreadcrumbs.getChildCount() - mRootFoldersCnt;
93+
if (cnt <= 0) {
9294
finish();
93-
else {
95+
} else {
9496
mBreadcrumbs.removeBreadcrumb();
9597
super.onBackPressed();
9698
}
@@ -118,11 +120,9 @@ public void itemClicked(FileDirItem item) {
118120

119121
@Override
120122
public void breadcrumbClicked(int id) {
121-
final int children = mBreadcrumbs.getChildCount() - 1;
122-
final int removeCnt = children - id;
123-
for (int i = 0; i < removeCnt; i++) {
124-
getSupportFragmentManager().popBackStack();
125-
mBreadcrumbs.removeBreadcrumb();
126-
}
123+
final FileDirItem item = (FileDirItem) mBreadcrumbs.getChildAt(id).getTag();
124+
final String path = item.getPath();
125+
openPath(path);
126+
mBreadcrumbs.setInitialBreadcrumb(path);
127127
}
128128
}

app/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<string name="please_select_destination">Bitte wähle ein Ziel</string>
3030
<string name="copy_failed">Konnte die Datei nicht kopieren</string>
3131
<string name="copying">Kopiere</string>
32-
<string name="initial_breadcrumb">home</string>
3332
<string name="ok">OK</string>
3433
<string name="cancel">Abbrechen</string>
3534

app/src/main/res/values-it/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<string name="please_select_destination">Seleziona una destinazione</string>
3030
<string name="copy_failed">Impossibile copiare i file</string>
3131
<string name="copying">Copia in corso</string>
32-
<string name="initial_breadcrumb">home</string>
3332
<string name="ok">OK</string>
3433
<string name="cancel">Cancel</string>
3534

app/src/main/res/values-ja/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<string name="please_select_destination">宛先を選択してください</string>
3030
<string name="copy_failed">ファイルをコピーできませんでした</string>
3131
<string name="copying">コピー中</string>
32-
<string name="initial_breadcrumb">ホーム</string>
3332
<string name="ok">OK</string>
3433
<string name="cancel">Cancel</string>
3534

app/src/main/res/values-sv/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<string name="please_select_destination">Please select a destination</string>
3030
<string name="copy_failed">Kunde inte kopiera filen</string>
3131
<string name="copying">Kopierar</string>
32-
<string name="initial_breadcrumb">home</string>
3332
<string name="ok">OK</string>
3433
<string name="cancel">Cancel</string>
3534

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<string name="please_select_destination">Please select a destination</string>
3030
<string name="copy_failed">Could not copy the files</string>
3131
<string name="copying">Copying</string>
32-
<string name="initial_breadcrumb">home</string>
3332
<string name="ok">OK</string>
3433
<string name="cancel">Cancel</string>
3534

0 commit comments

Comments
 (0)