Rename jail room terms for a more convenient chrooted (4389611e) · Commits · e / os / android_packages_apps_CMFileManager

src/com/cyanogenmod/explorer/activities/BookmarksActivity.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,

	private ListView mBookmarksListView;		private ListView mBookmarksListView;

	private boolean mJailRoom;		private boolean mChRooted;

	/**		/**
	* {@inheritDoc}		* {@inheritDoc}
	@@ -82,8 +82,8 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
	Log.d(TAG, "NavigationActivity.onCreate"); //$NON-NLS-1$		Log.d(TAG, "NavigationActivity.onCreate"); //$NON-NLS-1$
	}		}

	// Is in jail room?		// Is ChRooted?
	this.mJailRoom = !ExplorerApplication.isAdvancedMode();		this.mChRooted = !ExplorerApplication.isAdvancedMode();

	//Request features		//Request features
	setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
	@@ -274,9 +274,9 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
	*/		*/
	private List<Bookmark> loadBookmarks() {		private List<Bookmark> loadBookmarks() {
	// Bookmarks = HOME + FILESYSTEM + SD STORAGES + USER DEFINED		// Bookmarks = HOME + FILESYSTEM + SD STORAGES + USER DEFINED
	// In jail room mode = SD STORAGES + USER DEFINED (from SD STORAGES)		// In ChRooted mode = SD STORAGES + USER DEFINED (from SD STORAGES)
	List<Bookmark> bookmarks = new ArrayList<Bookmark>();		List<Bookmark> bookmarks = new ArrayList<Bookmark>();
	if (!this.mJailRoom) {		if (!this.mChRooted) {
	bookmarks.add(loadHomeBookmarks());		bookmarks.add(loadHomeBookmarks());
	bookmarks.addAll(loadFilesystemBookmarks());		bookmarks.addAll(loadFilesystemBookmarks());
	}		}
	@@ -415,7 +415,7 @@ public class BookmarksActivity extends Activity implements OnItemClickListener,
	if (cursor != null && cursor.moveToFirst()) {		if (cursor != null && cursor.moveToFirst()) {
	do {		do {
	Bookmark bm = new Bookmark(cursor);		Bookmark bm = new Bookmark(cursor);
	if (this.mJailRoom && StorageHelper.isPathInStorageVolume(bm.mPath)) {		if (this.mChRooted && StorageHelper.isPathInStorageVolume(bm.mPath)) {
	continue;		continue;
	}		}
	bookmarks.add(bm);		bookmarks.add(bm);

src/com/cyanogenmod/explorer/activities/NavigationActivity.java

+26 −25

Original line number	Original line	Diff line number	Diff line
	@@ -207,13 +207,13 @@ public class NavigationActivity extends Activity
	// Advanced mode		// Advanced mode
	if (key.compareTo(ExplorerSettings.		if (key.compareTo(ExplorerSettings.
	SETTINGS_ADVANCE_MODE.getId()) == 0) {		SETTINGS_ADVANCE_MODE.getId()) == 0) {
	// Is it necessary to create or exit of the jail room?		// Is it necessary to create or exit of the ChRooted?
	boolean jailRoom = !ExplorerApplication.isAdvancedMode();		boolean chRooted = !ExplorerApplication.isAdvancedMode();
	if (jailRoom != NavigationActivity.this.mJailRoom) {		if (chRooted != NavigationActivity.this.mChRooted) {
	if (jailRoom) {		if (chRooted) {
	createJailRoom();		createChRooted();
	} else {		} else {
	exitJailRoom();		exitChRooted();
	}		}
	}		}
	}		}
	@@ -239,7 +239,7 @@ public class NavigationActivity extends Activity
	/**		/**
	* @hide		* @hide
	*/		*/
	boolean mJailRoom;		boolean mChRooted;

	/**		/**
	* @hide		* @hide
	@@ -355,7 +355,7 @@ public class NavigationActivity extends Activity
	*/		*/
	private void init() {		private void init() {
	this.mHistory = new ArrayList<History>();		this.mHistory = new ArrayList<History>();
	this.mJailRoom = !ExplorerApplication.isAdvancedMode();		this.mChRooted = !ExplorerApplication.isAdvancedMode();
	}		}

	/**		/**
	@@ -484,7 +484,7 @@ public class NavigationActivity extends Activity
	throw new ConsoleAllocException("console == null"); //$NON-NLS-1$		throw new ConsoleAllocException("console == null"); //$NON-NLS-1$
	}		}
	} catch (Throwable ex) {		} catch (Throwable ex) {
	if (!NavigationActivity.this.mJailRoom) {		if (!NavigationActivity.this.mChRooted) {
	//Show exception and exists		//Show exception and exists
	Log.e(TAG, getString(R.string.msgs_cant_create_console), ex);		Log.e(TAG, getString(R.string.msgs_cant_create_console), ex);
	// We don't have any console		// We don't have any console
	@@ -510,7 +510,7 @@ public class NavigationActivity extends Activity
	Preferences.getSharedPreferences().getString(		Preferences.getSharedPreferences().getString(
	ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),		ExplorerSettings.SETTINGS_INITIAL_DIR.getId(),
	(String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());		(String)ExplorerSettings.SETTINGS_INITIAL_DIR.getDefaultValue());
	if (NavigationActivity.this.mJailRoom) {		if (NavigationActivity.this.mChRooted) {
	// Initial directory is the first external sdcard (sdcard, emmc, usb, ...)		// Initial directory is the first external sdcard (sdcard, emmc, usb, ...)
	StorageVolume[] volumes =		StorageVolume[] volumes =
	StorageHelper.getStorageVolumes(NavigationActivity.this);		StorageHelper.getStorageVolumes(NavigationActivity.this);
	@@ -658,8 +658,8 @@ public class NavigationActivity extends Activity
	new ExplorerSettings[]{ExplorerSettings.SETTINGS_LAYOUT_MODE}));		new ExplorerSettings[]{ExplorerSettings.SETTINGS_LAYOUT_MODE}));
	break;		break;
	case R.id.ab_view_options:		case R.id.ab_view_options:
	// If we are in jail room, then don't show non-secure items		// If we are in ChRooted mode, then don't show non-secure items
	if (this.mJailRoom) {		if (this.mChRooted) {
	showSettingsPopUp(view,		showSettingsPopUp(view,
	Arrays.asList(new ExplorerSettings[]{		Arrays.asList(new ExplorerSettings[]{
	ExplorerSettings.SETTINGS_SHOW_DIRS_FIRST}));		ExplorerSettings.SETTINGS_SHOW_DIRS_FIRST}));
	@@ -948,7 +948,7 @@ public class NavigationActivity extends Activity
	}		}

	// Check if console selection is allowed		// Check if console selection is allowed
	if (this.mJailRoom) {		if (this.mChRooted) {
	menu.removeItem(R.id.mnu_console);		menu.removeItem(R.id.mnu_console);
	}		}

	@@ -1354,17 +1354,18 @@ public class NavigationActivity extends Activity
	}		}

	/**		/**
	* Method that creates a jail room, protecting the user to break anything in the device		* Method that creates a ChRooted environment, protecting the user to break anything in
			* the device
	* @hide		* @hide
	*/		*/
	void createJailRoom() {		void createChRooted() {
	// If we are in a jail room, then do nothing		// If we are in a ChRooted mode, then do nothing
	if (this.mJailRoom) return;		if (this.mChRooted) return;
	this.mJailRoom = true;		this.mChRooted = true;

	int cc = this.mNavigationViews.length;		int cc = this.mNavigationViews.length;
	for (int i = 0; i < cc; i++) {		for (int i = 0; i < cc; i++) {
	this.mNavigationViews[i].createJailRoom();		this.mNavigationViews[i].createChRooted();
	}		}

	// Remove the selection		// Remove the selection
	@@ -1378,17 +1379,17 @@ public class NavigationActivity extends Activity
	}		}

	/**		/**
	* Method that exits from a jail room		* Method that exits from a ChRooted
	* @hide		* @hide
	*/		*/
	void exitJailRoom() {		void exitChRooted() {
	// If we aren't in a jail room, then do nothing		// If we aren't in a ChRooted mode, then do nothing
	if (!this.mJailRoom) return;		if (!this.mChRooted) return;
	this.mJailRoom = false;		this.mChRooted = false;

	int cc = this.mNavigationViews.length;		int cc = this.mNavigationViews.length;
	for (int i = 0; i < cc; i++) {		for (int i = 0; i < cc; i++) {
	this.mNavigationViews[i].exitJailRoom();		this.mNavigationViews[i].exitChRooted();
	}		}
	}		}

src/com/cyanogenmod/explorer/activities/PickerActivity.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -181,7 +181,7 @@ public class PickerActivity extends Activity
	try {		try {
	// Is there a console allocate		// Is there a console allocate
	if (!ConsoleBuilder.isAlloc()) {		if (!ConsoleBuilder.isAlloc()) {
	// Create a jail room console		// Create a ChRooted console
	ConsoleBuilder.createDefaultConsole(this, false, false);		ConsoleBuilder.createDefaultConsole(this, false, false);
	}		}
	// There is a console allocated. Use it.		// There is a console allocated. Use it.

src/com/cyanogenmod/explorer/parcelables/NavigationViewInfoParcelable.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -37,7 +37,7 @@ public class NavigationViewInfoParcelable extends HistoryNavigable {

	private int mId;		private int mId;
	private String mCurrentDir;		private String mCurrentDir;
	private boolean mJailRoom;		private boolean mChRooted;
	private List<FileSystemObject> mFiles;		private List<FileSystemObject> mFiles;
	private List<FileSystemObject> mSelectedFiles;		private List<FileSystemObject> mSelectedFiles;

	@@ -114,21 +114,21 @@ public class NavigationViewInfoParcelable extends HistoryNavigable {
	}		}

	/**		/**
	* Method that returns if the view is in a jail room.		* Method that returns if the view is in a ChRooted environment.
	*		*
	* @return boolean If the view is in a jail room		* @return boolean If the view is in a ChRooted environment
	*/		*/
	public boolean getJailRoom() {		public boolean getChRooted() {
	return this.mJailRoom;		return this.mChRooted;
	}		}

	/**		/**
	* Method that sets if the view is in a jail room.		* Method that sets if the view is in a ChRooted environment.
	*		*
	* @param jailRoom If the view is in a jail room		* @param chRooted If the view is in a ChRooted environment
	*/		*/
	public void setJailRoom(boolean jailRoom) {		public void setChRooted(boolean chRooted) {
	this.mJailRoom = jailRoom;		this.mChRooted = chRooted;
	}		}

	/**		/**
	@@ -188,7 +188,7 @@ public class NavigationViewInfoParcelable extends HistoryNavigable {
	dest.writeString(this.mCurrentDir);		dest.writeString(this.mCurrentDir);
	}		}
	//- 2		//- 2
	dest.writeInt(this.mJailRoom ? 1 : 0);		dest.writeInt(this.mChRooted ? 1 : 0);
	//- 3		//- 3
	dest.writeInt(this.mSelectedFiles == null ? 0 : 1);		dest.writeInt(this.mSelectedFiles == null ? 0 : 1);
	if (this.mSelectedFiles != null) {		if (this.mSelectedFiles != null) {
	@@ -215,7 +215,7 @@ public class NavigationViewInfoParcelable extends HistoryNavigable {
	this.mCurrentDir = in.readString();		this.mCurrentDir = in.readString();
	}		}
	//- 2		//- 2
	this.mJailRoom = (in.readInt() == 1);		this.mChRooted = (in.readInt() == 1);
	//- 3		//- 3
	int hasSelectedFiles = in.readInt();		int hasSelectedFiles = in.readInt();
	if (hasSelectedFiles == 1) {		if (hasSelectedFiles == 1) {

src/com/cyanogenmod/explorer/tasks/SearchResultDrawingAsyncTask.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -115,14 +115,14 @@ public class SearchResultDrawingAsyncTask extends AsyncTask<Object, Integer, Boo
	defaultValue);		defaultValue);
	SearchSortResultMode mode = SearchSortResultMode.fromId(value);		SearchSortResultMode mode = SearchSortResultMode.fromId(value);

	// Is in jail room?		// Are we in ChRooted environment?
	boolean jailRoom = !ExplorerApplication.isAdvancedMode();		boolean chRooted = !ExplorerApplication.isAdvancedMode();

	//Process all the data		//Process all the data
	final List<SearchResult> result =		final List<SearchResult> result =
	SearchHelper.convertToResults(		SearchHelper.convertToResults(
	FileHelper.applyUserPreferences(		FileHelper.applyUserPreferences(
	this.mFiles, MimeTypeHelper.ALL_MIME_TYPES, true, jailRoom),		this.mFiles, MimeTypeHelper.ALL_MIME_TYPES, true, chRooted),
	this.mQueries);		this.mQueries);
	if (mode.compareTo(SearchSortResultMode.NAME) == 0) {		if (mode.compareTo(SearchSortResultMode.NAME) == 0) {
	Collections.sort(result, new Comparator<SearchResult>() {		Collections.sort(result, new Comparator<SearchResult>() {