Skip to content

Commit

Permalink
Merge pull request #1123 from meenbeese/rewrite-del-frag
Browse files Browse the repository at this point in the history
Rewrite OnionServiceDeleteDialogFragment in Kotlin
  • Loading branch information
bitmold committed May 3, 2024
2 parents cba85e5 + 0797f82 commit 15dc751
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 46 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.torproject.android.ui.v3onionservice

import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.os.Bundle

import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment

import org.torproject.android.R
import org.torproject.android.core.DiskUtils.recursivelyDeleteDirectory
import org.torproject.android.service.OrbotConstants

import java.io.File

class OnionServiceDeleteDialogFragment internal constructor(arguments: Bundle?) : DialogFragment() {
init {
setArguments(arguments)
}

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return AlertDialog.Builder(requireContext())
.setTitle(R.string.confirm_service_deletion)
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> doDelete(arguments, requireContext()) }
.setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.cancel() }
.create()
}

private fun doDelete(arguments: Bundle?, context: Context) {
context.contentResolver.delete(
OnionServiceContentProvider.CONTENT_URI,
OnionServiceContentProvider.OnionService._ID + '=' + requireArguments().getInt(
OnionServiceActivity.BUNDLE_KEY_ID
),
null
)
val base = context.filesDir.absolutePath + "/" + OrbotConstants.ONION_SERVICES_DIR
val localPath = arguments?.getString(OnionServiceActivity.BUNDLE_KEY_PATH)
localPath?.let { recursivelyDeleteDirectory(File(base, localPath)) }
(requireActivity() as OnionServiceActivity).showBatteryOptimizationsMessageIfAppropriate()
}
}

0 comments on commit 15dc751

Please sign in to comment.