renaming otg strings to usb (0a095fb0) · Commits · e / os / Simple-Commons

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		if (requestCode == OPEN_DOCUMENT_TREE && resultCode == Activity.RESULT_OK && resultData != null) {
		if (isProperSDFolder(resultData.data)) {
		if (resultData.dataString == baseConfig.OTGTreeUri) {
		toast(R.string.sd_card_otg_same)
		toast(R.string.sd_card_usb_same)
		return
		}
		saveTreeUri(resultData)
		@@ -163,7 +163,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		if (isProperOTGFolder(resultData.data)) {
		if (resultData.dataString == baseConfig.treeUri) {
		funAfterOTGPermission?.invoke(false)
		toast(R.string.sd_card_otg_same)
		toast(R.string.sd_card_usb_same)
		return
		}
		baseConfig.OTGTreeUri = resultData.dataString
		@@ -172,7 +172,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		funAfterOTGPermission?.invoke(true)
		funAfterOTGPermission = null
		} else {
		toast(R.string.wrong_root_selected_otg)
		toast(R.string.wrong_root_selected_usb)
		val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
		startActivityForResult(intent, requestCode)
		}

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/StoragePickerDialog.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ class StoragePickerDialog(val activity: BaseSimpleActivity, currPath: String, va
		val otgButton = inflater.inflate(R.layout.radio_button, null) as RadioButton
		otgButton.apply {
		id = ID_OTG
		text = resources.getString(R.string.otg)
		text = resources.getString(R.string.usb)
		isChecked = basePath == OTG_PATH
		setOnClickListener { otgPicked() }
		if (isChecked) {

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ fun Context.getHumanReadablePath(path: String): String {
		return getString(when (path) {
		"/" -> R.string.root
		internalStoragePath -> R.string.internal
		OTG_PATH -> R.string.otg
		OTG_PATH -> R.string.usb
		else -> R.string.sd_card
		})
		}

commons/src/main/res/layout/dialog_write_permission_otg.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginBottom="@dimen/activity_margin"
		android:text="@string/confirm_otg_storage_access_text"/>
		android:text="@string/confirm_usb_storage_access_text"/>

		<ImageView
		android:id="@+id/write_permissions_dialog_otg_image"

commons/src/main/res/values-ar/strings.xml

+5 −5

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@
		<string name="sd_card">SD Card</string>
		<string name="root">Root</string>
		<string name="wrong_root_selected">Wrong folder selected, please select the root folder of your SD card</string>
		<string name="sd_card_otg_same">SD card and OTG device paths cannot be the same</string>
		<string name="sd_card_usb_same">SD card and USB device paths cannot be the same</string>
		<string name="app_on_sd_card">You seem to have the app installed on an SD card, that makes the app widgets unavailable. You won\'t even see them on the list of available widgets.
		It is a system limitation, so if you want to use the widgets, you have to move the app back on the internal storage.</string>

		@@ -435,10 +435,10 @@
		<string name="no_entries_for_exporting">No entries for exporting have been found</string>

		<!-- OTG devices -->
		<string name="otg">OTG</string>
		<string name="otg_detected">You seem to have an OTG device attached to your device. To make sure its files appear properly, you need to grant additional permissions.</string>
		<string name="confirm_otg_storage_access_text">Please choose the root folder of the OTG device on the next screen, to grant access</string>
		<string name="wrong_root_selected_otg">Wrong folder selected, please select the root folder of your OTG device</string>
		<string name="usb">USB</string>
		<string name="usb_detected">You seem to have an USB device attached to your device. To make sure its files appear properly, you need to grant additional permissions.</string>
		<string name="confirm_usb_storage_access_text">Please choose the root folder of the USB device on the next screen, to grant access</string>
		<string name="wrong_root_selected_usb">Wrong folder selected, please select the root folder of your USB device</string>

		<!-- Dates -->
		<string name="january">January</string>