Merge remote-tracking branch 'upstream/cm-10.1' into ics

CyanogenMod · Jan 10, 2013 · db195c4 · db195c4
2 parents 9610d1c + 9f86075
commit db195c4
Show file tree

Hide file tree

Showing 29 changed files with 102 additions and 912 deletions.
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
@@ -100,7 +100,7 @@
     <!-- The operation will cause inconsistencies -->
     <string name="msgs_unresolved_inconsistencies">A művelet nem engedélyezett, mert következetlenséget okozna.</string>
     <!-- Operation not permitted in current directory -->
-    <string name="msgs_operation_not_allowed_in_current_directory">A művelet nem engedélyezett a jelenlegi mappában.</string>
+    <string name="msgs_operation_not_allowed_in_current_directory">A művelet nem engedélyezett a jelenlegi mappában.\n\nA célmappa nem lehet azonos a forrásmappával, és nem lehet annak almappája.</string>
 
     <!-- The advice message prior to exit the application -->
     <string name="msgs_push_again_to_exit">Nyomja meg mégegyszer a kilépéshez.</string>
@@ -237,6 +237,12 @@
     <string name="fso_properties_dialog_size">Méret:</string>
     <!-- Fso Properties Dialog * Contains Label -->
     <string name="fso_properties_dialog_contains">Tartalmaz:</string>
+    <!-- Fso Properties Dialog * Last Accessed Time Label -->
+    <string name="fso_properties_dialog_last_accessed_date">Elérés ideje:</string>
+    <!-- Fso Properties Dialog * Last Modified Time Label -->
+    <string name="fso_properties_dialog_last_modified_date">Módosítás ideje:</string>
+    <!-- Fso Properties Dialog * Last Changed Time -->
+    <string name="fso_properties_dialog_last_changed_date">Adatváltozás ideje:</string>
     <!-- Fso Properties Dialog * Owner Label -->
     <string name="fso_properties_dialog_owner">Tulajdonos:</string>
     <!-- Fso Properties Dialog * Group Label -->
@@ -331,7 +337,7 @@
     <!-- Initial directory dialog title -->
     <string name="initial_directory_dialog_title">Kezdőkönyvtár</string>
     <!-- Initial directory label -->
-    <string name="initial_directory_label">Válasszon kezdőkonyvtárat:</string>
+    <string name="initial_directory_label">Válasszon kezdőkönyvtárat:</string>
     <!-- Initial directory is relative -->
     <string name="initial_directory_relative_msg">Relatív útvonalak nem használhatóak.</string>
     <!-- Initial directory error message -->
@@ -401,9 +407,9 @@
     <!-- Actions Dialog * Menu * Deselect -->
     <string name="actions_menu_deselect">Elvet</string>
     <!-- Actions Dialog * Menu * Paste selection -->
-    <string name="actions_menu_paste_selection">Kijelöltek beillesztése</string>
+    <string name="actions_menu_paste_selection">Kijelöltek beillesztése ide</string>
     <!-- Actions Dialog * Menu * Move selection -->
-    <string name="actions_menu_move_selection">Kijelöltek mozgatása</string>
+    <string name="actions_menu_move_selection">Kijelöltek mozgatása ide</string>
     <!-- Actions Dialog * Menu * Delete selection -->
     <string name="actions_menu_delete_selection">Kijelöltek törlése</string>
     <!-- Actions Dialog * Menu * Compress selection -->

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
@@ -242,6 +242,12 @@
   <string name="fso_properties_dialog_size">Grootte:</string>
   <!-- Fso Properties Dialog * Contains Label -->
   <string name="fso_properties_dialog_contains">Inhoud:</string>
+  <!-- Fso Properties Dialog * Last Accessed Time Label -->
+  <string name="fso_properties_dialog_last_accessed_date">Geopend:</string>
+  <!-- Fso Properties Dialog * Last Modified Time Label -->
+  <string name="fso_properties_dialog_last_modified_date">Bewerkt:</string>
+  <!-- Fso Properties Dialog * Last Changed Time -->
+  <string name="fso_properties_dialog_last_changed_date">Gewijzigd:</string>
   <!-- Fso Properties Dialog * Owner Label -->
   <string name="fso_properties_dialog_owner">Eigenaar:</string>
   <!-- Fso Properties Dialog * Group Label -->

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
@@ -269,7 +269,7 @@
   <string name="pref_access_mode_prompt">Mod interogare</string>
   <string name="pref_access_mode_prompt_summary">Mod interogare\n\nAplicaţia se execută cu acces total la fişierele de sistem, dar va solicita permisiuni pentru a efectua operaţiuni privelegiate</string>
   <string name="pref_access_mode_root">Mod acces Root</string>
-  <string name="pref_access_mode_root_summary">Mod cccess Root\n\nAvertizare! Acest mod permite operaţiuni ce pot duce la defectarea dispozitivului Dvs. Este responsabilitatea Dvs. să vă asigurați ce operațiune este sigură</string>
+  <string name="pref_access_mode_root_summary">Mod acces Root\n\nAvertizare! Acest mod permite operaţiuni ce pot duce la defectarea dispozitivului Dvs. Este responsabilitatea Dvs. să vă asigurați ce operațiune este sigură</string>
   <string name="pref_search_results_category">Rezultate</string>
   <string name="pref_show_relevance_widget">Afişare widget relevanţă</string>
   <string name="pref_highlight_terms">Evidenţiere termeni de căutare</string>

diff --git a/res/xml/command_list.xml b/res/xml/command_list.xml
@@ -39,10 +39,6 @@
   <command commandId="bash" commandPath="/system/bin/sh" commandArgs="" />
   <command commandId="su" commandPath="/system/xbin/su" commandArgs="" />
 
-  <!-- Directory -->
-  <command commandId="cd" commandPath="cd" commandArgs="%1$s" />
-  <command commandId="pwd" commandPath="/system/xbin/pwd" commandArgs="-P" />
-
   <!-- Console info -->
   <command commandId="groups" commandPath="/system/xbin/groups" commandArgs="" />
   <command commandId="id" commandPath="/system/bin/id" commandArgs="-Gn" />
@@ -52,7 +48,7 @@
   <command commandId="mountpointinfo" commandPath="/system/bin/mount" commandArgs="" />
 
   <!-- List/Find/Info -->
-  <command commandId="ls" commandPath="/system/bin/ls" commandArgs="%1$s 1&gt; /dev/null &amp;&amp; /system/xbin/stat -t %1$s* 2&gt;&amp;1" />
+  <command commandId="ls" commandPath="/system/bin/ls" commandArgs="%1$s 1&gt; /dev/null &amp;&amp; /system/xbin/stat -t %1$s.* %1$s* 2&gt; /dev/null" />
   <command commandId="fileinfo" commandPath="/system/xbin/stat" commandArgs="-t %1$s 2&gt;&amp;1" />
   <command commandId="find" commandPath="/system/xbin/find" commandArgs="%1$s \\( -name %2$s -o -name %3$s -o -name %4$s -o -name %5$s -o -name %6$s \\) -exec /system/xbin/stat -t {} 2&gt;&amp;1 \\;" />
   <command commandId="quickfoldersearch" commandPath="/system/bin/ls" commandArgs="-aFd %1$s.* %1$s* 2&gt; /dev/null | /system/xbin/grep -e '^d' -e '^ld' | /system/xbin/cut -d&quot; &quot; -f2-" />

diff --git a/src/com/cyanogenmod/filemanager/FileManagerApplication.java b/src/com/cyanogenmod/filemanager/FileManagerApplication.java
@@ -36,7 +36,6 @@
 import com.cyanogenmod.filemanager.ui.ThemeManager;
 import com.cyanogenmod.filemanager.ui.ThemeManager.Theme;
 import com.cyanogenmod.filemanager.util.AIDHelper;
-import com.cyanogenmod.filemanager.util.FileHelper;
 import com.cyanogenmod.filemanager.util.MimeTypeHelper;
 
 import java.io.File;
@@ -354,13 +353,11 @@ private static synchronized void allocBackgroundConsole(Context ctx) {
             if (ConsoleBuilder.isPrivileged()) {
                 sBackgroundConsole =
                         new ConsoleHolder(
-                                ConsoleBuilder.createPrivilegedConsole(
-                                        ctx, FileHelper.ROOT_DIRECTORY));
+                                ConsoleBuilder.createPrivilegedConsole(ctx));
             } else {
                 sBackgroundConsole =
                         new ConsoleHolder(
-                                ConsoleBuilder.createNonPrivilegedConsole(
-                                        ctx, FileHelper.ROOT_DIRECTORY));
+                                ConsoleBuilder.createNonPrivilegedConsole(ctx));
             }
         } catch (Exception e) {
             Log.e(TAG,
@@ -389,8 +386,7 @@ public static void changeBackgroundConsoleToPriviligedConsole()
                 sBackgroundConsole =
                         new ConsoleHolder(
                                 ConsoleBuilder.createPrivilegedConsole(
-                                        getInstance().getApplicationContext(),
-                                        FileHelper.ROOT_DIRECTORY));
+                                        getInstance().getApplicationContext()));
             } catch (Exception e) {
                 try {
                     if (sBackgroundConsole != null) {
@@ -410,6 +406,9 @@ public static void changeBackgroundConsoleToPriviligedConsole()
      * @return boolean If the access mode of the application
      */
     public static AccessMode getAccessMode() {
+        if (!sIsDeviceRooted) {
+            return AccessMode.SAFE;
+        }
         String defaultValue =
                 ((ObjectStringIdentifier)FileManagerSettings.
                             SETTINGS_ACCESS_MODE.getDefaultValue()).getId();

diff --git a/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java b/src/com/cyanogenmod/filemanager/activities/NavigationActivity.java
@@ -582,10 +582,10 @@ public void run() {
                     }
                 } catch (Throwable ex) {
                     if (!NavigationActivity.this.mChRooted) {
-                        //Show exception and exists
+                        //Show exception and exit
                         Log.e(TAG, getString(R.string.msgs_cant_create_console), ex);
                         // We don't have any console
-                        // Show exception and exists
+                        // Show exception and exit
                         DialogHelper.showToast(
                                 NavigationActivity.this,
                                 R.string.msgs_cant_create_console, Toast.LENGTH_LONG);
@@ -614,6 +614,13 @@ public void run() {
                                 StorageHelper.getStorageVolumes(NavigationActivity.this);
                         if (volumes != null && volumes.length > 0) {
                             initialDir = volumes[0].getPath();
+                        } else {
+                            // Show exception and exit
+                            DialogHelper.showToast(
+                                    NavigationActivity.this,
+                                    R.string.msgs_cant_create_console, Toast.LENGTH_LONG);
+                            exit();
+                            return;
                         }
                     }
 
@@ -1422,7 +1429,7 @@ void askOrExit() {
                     public void onClick(DialogInterface alertDialog, int which) {
                         if (which == DialogInterface.BUTTON_NEGATIVE) {
                             // We don't have any console
-                            // Show exception and exists
+                            // Show exception and exit
                             DialogHelper.showToast(
                                     NavigationActivity.this,
                                     R.string.msgs_cant_create_console, Toast.LENGTH_LONG);

diff --git a/src/com/cyanogenmod/filemanager/commands/ChangeCurrentDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/ChangeCurrentDirExecutable.java
diff --git a/src/com/cyanogenmod/filemanager/commands/CurrentDirExecutable.java b/src/com/cyanogenmod/filemanager/commands/CurrentDirExecutable.java
diff --git a/src/com/cyanogenmod/filemanager/commands/ExecutableCreator.java b/src/com/cyanogenmod/filemanager/commands/ExecutableCreator.java
@@ -32,20 +32,6 @@
  */
 public interface ExecutableCreator {
 
-    /**
-     * Method that creates an executable for change the current directory.
-     *
-     * @param dir The absolute path of the new directory to establish as current directory
-     * @return ChangeCurrentDirExecutable A {@link ChangeCurrentDirExecutable} executable
-     * implementation reference
-     * @throws CommandNotFoundException If the executable can't be created
-     * @throws NoSuchFileOrDirectory If the file or directory was not found
-     * @throws InsufficientPermissionsException If an operation requires elevated permissions
-     */
-    ChangeCurrentDirExecutable createChangeCurrentDirExecutable(
-            String dir) throws CommandNotFoundException,
-            NoSuchFileOrDirectory, InsufficientPermissionsException;
-
     /**
      * Method that creates an executable for change the owner of a file system object.
      *
@@ -118,18 +104,6 @@ CreateDirExecutable createCreateDirectoryExecutable(String dir)
     CreateFileExecutable createCreateFileExecutable(String file) throws CommandNotFoundException,
             NoSuchFileOrDirectory, InsufficientPermissionsException;
 
-    /**
-     * Method that creates an executable for retrieve the current directory.
-     *
-     * @return CurrentDirExecutable A {@link CurrentDirExecutable} executable
-     * implementation reference
-     * @throws CommandNotFoundException If the executable can't be created
-     * @throws NoSuchFileOrDirectory If the file or directory was not found
-     * @throws InsufficientPermissionsException If an operation requires elevated permissions
-     */
-    CurrentDirExecutable createCurrentDirExecutable() throws CommandNotFoundException,
-            NoSuchFileOrDirectory, InsufficientPermissionsException;
-
     /**
      * Method that creates an executable for delete a directory.
      *

diff --git a/src/com/cyanogenmod/filemanager/commands/java/ChangeCurrentDirCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ChangeCurrentDirCommand.java