From 9b7de55f55c427f9c0c3db9d990ae7386e0a45ed Mon Sep 17 00:00:00 2001 From: Zerglrisk Date: Mon, 20 Jun 2016 22:03:12 +0900 Subject: [PATCH] Fix Folder open if no file --- .idea/codeStyleSettings.xml | 201 ------------------ .idea/copyright/Copyright_Vlad_Mihalachi.xml | 9 - .idea/dictionaries/mac.xml | 3 - .idea/inspectionProfiles/Project_Default.xml | 14 -- .../inspectionProfiles/profiles_settings.xml | 7 - build/intermediates/dex-cache/cache.xml | 158 +++++++------- .../turboeditor/activity/MainActivity.java | 11 +- .../activity/SelectFileActivity.java | 2 + 8 files changed, 86 insertions(+), 319 deletions(-) delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/copyright/Copyright_Vlad_Mihalachi.xml delete mode 100644 .idea/dictionaries/mac.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 697ae50..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/copyright/Copyright_Vlad_Mihalachi.xml b/.idea/copyright/Copyright_Vlad_Mihalachi.xml deleted file mode 100644 index 866a560..0000000 --- a/.idea/copyright/Copyright_Vlad_Mihalachi.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/dictionaries/mac.xml b/.idea/dictionaries/mac.xml deleted file mode 100644 index e6a791d..0000000 --- a/.idea/dictionaries/mac.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index e070203..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 6933c1e..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index 58a04b2..ca26387 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -3,57 +3,57 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + - + + + + + + + - - - - - - - - - - + diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/MainActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/MainActivity.java index 43ff517..28245fd 100644 --- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/MainActivity.java +++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/MainActivity.java @@ -178,7 +178,6 @@ public abstract class MainActivity extends ActionBarActivity implements IHomeAct private PageSystemButtons pageSystemButtons; private static String currentEncoding = "UTF-16"; private Toolbar toolbar; - /* Navigation Drawer */ @@ -356,10 +355,11 @@ public abstract class MainActivity extends ActionBarActivity implements IHomeAct refreshList(newUri, true, false); arrayAdapter.selectPosition(newUri); } - - Uri particularUri = Uri.parse("file://" + fileList[0].getPath()); - final GreatUri newUri = new GreatUri(particularUri, AccessStorageApi.getPath(this, particularUri), AccessStorageApi.getName(this, particularUri)); - newFileToOpen(newUri, ""); + if(fileList.length > 0) { + Uri particularUri = Uri.parse("file://" + fileList[0].getPath()); + final GreatUri newUri = new GreatUri(particularUri, AccessStorageApi.getPath(this, particularUri), AccessStorageApi.getName(this, particularUri)); + newFileToOpen(newUri, ""); + } } else { @@ -1235,7 +1235,6 @@ public abstract class MainActivity extends ActionBarActivity implements IHomeAct subActivity.putExtra("action", SelectFileActivity.Actions.SelectFile); AnimationUtils.startActivityWithScale(this, subActivity, true, SELECT_FOLDER_CODE, view); - } public void CreateFile(View view) { diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java index 5390891..569167a 100644 --- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java +++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java @@ -89,6 +89,8 @@ public class SelectFileActivity extends ActionBarActivity implements SearchView. wantAFile = true; //action == Actions.SelectFile; mfabOkMode = false; folderOpenMode = getIntent().getBooleanExtra("foldermode", false); + if(folderOpenMode) + setTitle("Open Folder"); listView = (ListView) findViewById(android.R.id.list); listView.setOnItemClickListener(this);