Skip to content

Commit 44e268b

Browse files
committed
add an image about the Kitkat new write permission thing
1 parent 479c3c6 commit 44e268b

File tree

14 files changed

+74
-2
lines changed

14 files changed

+74
-2
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import android.view.MenuItem
1414
import com.simplemobiletools.filemanager.Constants
1515
import com.simplemobiletools.filemanager.R
1616
import com.simplemobiletools.filemanager.Utils
17+
import com.simplemobiletools.filemanager.dialogs.WritePermissionDialog
1718
import com.simplemobiletools.filemanager.fragments.ItemsFragment
1819
import com.simplemobiletools.filepicker.dialogs.StoragePickerDialog
1920
import com.simplemobiletools.filepicker.extensions.getInternalStoragePath
@@ -137,8 +138,12 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
137138
fun checkStupidAndroidFiveSDCardWritePermission(pickedPath: String): Boolean {
138139
val file = File(pickedPath)
139140
return if (!file.canWrite() && Utils.needsStupidWritePermissions(applicationContext, pickedPath) && mConfig.treeUri.isEmpty()) {
140-
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
141-
startActivityForResult(intent, OPEN_DOCUMENT_TREE)
141+
WritePermissionDialog(this, object: WritePermissionDialog.OnWritePermissionListener {
142+
override fun onConfirmed() {
143+
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
144+
startActivityForResult(intent, OPEN_DOCUMENT_TREE)
145+
}
146+
})
142147
false
143148
} else
144149
true
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.simplemobiletools.filemanager.dialogs
2+
3+
import android.content.Context
4+
import android.support.v7.app.AlertDialog
5+
import android.view.LayoutInflater
6+
import com.simplemobiletools.filemanager.R
7+
8+
class WritePermissionDialog(val context: Context, val listener: OnWritePermissionListener) {
9+
var dialog: AlertDialog? = null
10+
11+
init {
12+
val view = LayoutInflater.from(context).inflate(R.layout.write_permission, null)
13+
14+
dialog = AlertDialog.Builder(context)
15+
.setTitle(context.resources.getString(R.string.confirm_storage_access_title))
16+
.setView(view)
17+
.setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() })
18+
.create()
19+
20+
dialog?.show()
21+
}
22+
23+
private fun dialogConfirmed() {
24+
dialog?.dismiss()
25+
listener.onConfirmed()
26+
}
27+
28+
interface OnWritePermissionListener {
29+
fun onConfirmed()
30+
}
31+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:id="@+id/dialog_holder"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:orientation="vertical"
8+
android:padding="@dimen/activity_margin">
9+
10+
<TextView
11+
android:id="@+id/dialog_text"
12+
android:layout_width="match_parent"
13+
android:layout_height="wrap_content"
14+
android:layout_marginBottom="@dimen/activity_margin"
15+
android:text="@string/confirm_storage_access_text"/>
16+
17+
<ImageView
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content"
20+
android:scaleType="fitCenter"
21+
android:adjustViewBounds="true"
22+
android:src="@mipmap/write_storage"/>
23+
24+
</LinearLayout>
26.2 KB
Loading
14.4 KB
Loading
41.9 KB
Loading
53.7 KB
Loading
65.9 KB
Loading

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<string name="ok">OK</string>
3838
<string name="cancel">Abbrechen</string>
3939
<string name="press_back_again">Drücke erneut zum Schließen</string>
40+
<string name="confirm_storage_access_title">Confirm external storage access</string>
41+
<string name="confirm_storage_access_text">Please choose the root folder of the SD card to grant write access on the next screen</string>
4042

4143
<!-- File and directory properties -->
4244
<string name="name">Name</string>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<string name="ok">OK</string>
3838
<string name="cancel">Annulla</string>
3939
<string name="press_back_again">Premi di nuovo indietro per uscire</string>
40+
<string name="confirm_storage_access_title">Confirm external storage access</string>
41+
<string name="confirm_storage_access_text">Please choose the root folder of the SD card to grant write access on the next screen</string>
4042

4143
<!-- File and directory properties -->
4244
<string name="name">Nome</string>

0 commit comments

Comments
 (0)