Skip to content

Commit 7ab4c01

Browse files
tibbitibbi
committed
replace some functions with extension helpers
1 parent 75231e8 commit 7ab4c01

File tree

6 files changed

+19
-44
lines changed

6 files changed

+19
-44
lines changed

‎app/src/main/java/com/simplemobiletools/filemanager/asynctasks/CopyTask.kt‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import com.simplemobiletools.filemanager.Config
88
import com.simplemobiletools.filemanager.fragments.ItemsFragment
99
import com.simplemobiletools.filepicker.extensions.getFileDocument
1010
import com.simplemobiletools.filepicker.extensions.needsStupidWritePermissions
11-
import com.simplemobiletools.filepicker.extensions.rescanItem
11+
import com.simplemobiletools.filepicker.extensions.scanFile
12+
import com.simplemobiletools.filepicker.extensions.scanFiles
1213
import java.io.*
1314
import java.lang.ref.WeakReference
1415
import java.util.*
1516

16-
class CopyTask(listener: CopyTask.CopyListener, val context: Context, val deleteAfterCopy: Boolean) : AsyncTask<Pair<List<File>, File>, Void, Boolean>() {
17+
class CopyTask(listener: CopyTask.CopyListener, val context: Context, val deleteAfterCopy: Boolean) : AsyncTask<Pair<ArrayList<File>, File>, Void, Boolean>() {
1718
private val TAG = CopyTask::class.java.simpleName
1819
private var mListener: WeakReference<CopyListener>? = null
1920
private var mMovedFiles: ArrayList<File>
@@ -25,7 +26,7 @@ class CopyTask(listener: CopyTask.CopyListener, val context: Context, val delete
2526
mConfig = Config.newInstance(context)
2627
}
2728

28-
override fun doInBackground(vararg params: Pair<List<File>, File>): Boolean? {
29+
override fun doInBackground(vararg params: Pair<ArrayList<File>, File>): Boolean? {
2930
val pair = params[0]
3031
val files = pair.first
3132
for (file in files) {
@@ -50,6 +51,8 @@ class CopyTask(listener: CopyTask.CopyListener, val context: Context, val delete
5051
}
5152
}
5253
}
54+
context.scanFiles(files) {}
55+
context.scanFiles(mMovedFiles) {}
5356
return true
5457
}
5558

@@ -85,7 +88,7 @@ class CopyTask(listener: CopyTask.CopyListener, val context: Context, val delete
8588
val inputStream = FileInputStream(newFile)
8689
val out = context.contentResolver.openOutputStream(document.uri)
8790
copyStream(inputStream, out)
88-
context.rescanItem(destination)
91+
context.scanFile(destination) {}
8992
mMovedFiles.add(source)
9093
}
9194
} else {
@@ -112,7 +115,7 @@ class CopyTask(listener: CopyTask.CopyListener, val context: Context, val delete
112115
}
113116

114117
copyStream(inputStream, out)
115-
context.rescanItem(destination)
118+
context.scanFile(destination) {}
116119
mMovedFiles.add(source)
117120
}
118121

‎app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ private void displayCopyDialog() {
365365
if (itemIndexes.isEmpty())
366366
return;
367367

368-
final List<File> itemsToCopy = new ArrayList<>(itemIndexes.size());
368+
final ArrayList<File> itemsToCopy = new ArrayList<>(itemIndexes.size());
369369
for (Integer i : itemIndexes) {
370370
FileDirItem item = mItems.get(i);
371371
itemsToCopy.add(new File(item.getPath()));
@@ -454,16 +454,6 @@ private void deleteItems() {
454454
mToBeDeleted.clear();
455455
}
456456

457-
private void rescanItem(File item) {
458-
if (item.isDirectory()) {
459-
for (File child : item.listFiles()) {
460-
rescanItem(child);
461-
}
462-
}
463-
464-
MediaScannerConnection.scanFile(getContext(), new String[]{item.getAbsolutePath()}, null, null);
465-
}
466-
467457
private void deleteItem(File item) {
468458
if (item.isDirectory()) {
469459
for (File child : item.listFiles()) {

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CopyDialog.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import com.simplemobiletools.filepicker.dialogs.FilePickerDialog
1414
import com.simplemobiletools.filepicker.extensions.*
1515
import kotlinx.android.synthetic.main.copy_item.view.*
1616
import java.io.File
17+
import java.util.*
1718

18-
class CopyDialog(val activity: Activity, val files: List<File>, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
19+
class CopyDialog(val activity: Activity, val files: ArrayList<File>, val copyListener: CopyTask.CopyListener, val listener: OnCopyListener) {
1920

2021
init {
2122
val context = activity
@@ -82,21 +83,20 @@ class CopyDialog(val activity: Activity, val files: List<File>, val copyListener
8283

8384
if (view.dialog_radio_group.checkedRadioButtonId == R.id.dialog_radio_copy) {
8485
context.toast(R.string.copying)
85-
val pair = Pair<List<File>, File>(files, destinationDir)
86+
val pair = Pair<ArrayList<File>, File>(files, destinationDir)
8687
CopyTask(copyListener, context, false).execute(pair)
8788
dismiss()
8889
} else {
8990
if (context.isPathOnSD(sourcePath) || context.isPathOnSD(destinationPath)) {
9091
context.toast(R.string.moving)
91-
val pair = Pair<List<File>, File>(files, destinationDir)
92+
val pair = Pair<ArrayList<File>, File>(files, destinationDir)
9293
CopyTask(copyListener, context, true).execute(pair)
9394
dismiss()
9495
} else {
9596
for (file in files) {
9697
val destination = File(destinationDir, file.name)
9798
file.renameTo(destination)
98-
context.rescanItem(file)
99-
context.rescanItem(destination)
99+
context.scanFiles(arrayListOf(file, destination)) {}
100100
}
101101

102102
context.toast(R.string.moving_success)

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/CreateNewItemDialog.kt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ import android.view.View
77
import android.view.WindowManager
88
import com.simplemobiletools.filemanager.Config
99
import com.simplemobiletools.filemanager.R
10-
import com.simplemobiletools.filemanager.extensions.isValidFilename
11-
import com.simplemobiletools.filemanager.extensions.value
12-
import com.simplemobiletools.filepicker.extensions.getFileDocument
13-
import com.simplemobiletools.filepicker.extensions.needsStupidWritePermissions
14-
import com.simplemobiletools.filepicker.extensions.toast
10+
import com.simplemobiletools.filepicker.extensions.*
1511
import kotlinx.android.synthetic.main.create_new.view.*
1612
import java.io.File
1713
import java.io.IOException
@@ -32,7 +28,7 @@ class CreateNewItemDialog(val context: Context, val path: String, val listener:
3228
val name = view.item_name.value
3329
if (name.isEmpty()) {
3430
context.toast(R.string.empty_name)
35-
} else if (name.isValidFilename()) {
31+
} else if (name.isAValidFilename()) {
3632
val file = File(path, name)
3733
if (file.exists()) {
3834
context.toast(R.string.name_taken)

‎app/src/main/kotlin/com/simplemobiletools/filemanager/dialogs/RenameItemDialog.kt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import android.view.LayoutInflater
66
import android.view.WindowManager
77
import com.simplemobiletools.filemanager.Config
88
import com.simplemobiletools.filemanager.R
9-
import com.simplemobiletools.filemanager.extensions.isValidFilename
10-
import com.simplemobiletools.filemanager.extensions.value
11-
import com.simplemobiletools.filepicker.extensions.getFileDocument
12-
import com.simplemobiletools.filepicker.extensions.needsStupidWritePermissions
13-
import com.simplemobiletools.filepicker.extensions.rescanItem
14-
import com.simplemobiletools.filepicker.extensions.toast
9+
import com.simplemobiletools.filepicker.extensions.*
1510
import com.simplemobiletools.filepicker.models.FileDirItem
1611
import kotlinx.android.synthetic.main.rename_item.view.*
1712
import java.io.File
@@ -32,7 +27,7 @@ class RenameItemDialog(val context: Context, val path: String, val item: FileDir
3227
show()
3328
getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener({
3429
val newName = view.item_name.value
35-
if (newName.isValidFilename()) {
30+
if (newName.isAValidFilename()) {
3631
val currFile = File(path, item.name)
3732
val newFile = File(path, newName)
3833

@@ -63,8 +58,7 @@ class RenameItemDialog(val context: Context, val path: String, val item: FileDir
6358
}
6459

6560
private fun sendSuccess(currFile: File, newFile: File) {
66-
context.rescanItem(currFile)
67-
context.rescanItem(newFile)
61+
context.scanFiles(arrayListOf(currFile, newFile)) {}
6862
listener.onSuccess()
6963
}
7064

‎app/src/main/kotlin/com/simplemobiletools/filemanager/extensions/long.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.simplemobiletools.filemanager.extensions
22

3-
import android.text.format.DateFormat
43
import java.text.DecimalFormat
5-
import java.util.*
64

75
fun Long.formatSize(): String {
86
if (this <= 0)
@@ -12,9 +10,3 @@ fun Long.formatSize(): String {
1210
val digitGroups = (Math.log10(toDouble()) / Math.log10(1024.0)).toInt()
1311
return DecimalFormat("#,##0.#").format(this / Math.pow(1024.0, digitGroups.toDouble())) + " " + units[digitGroups]
1412
}
15-
16-
fun Long.formatLastModified(): String {
17-
val cal = Calendar.getInstance(Locale.ENGLISH)
18-
cal.timeInMillis = this
19-
return DateFormat.format("dd.MM.yyyy HH:mm", cal).toString()
20-
}

0 commit comments

Comments
 (0)