frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

ui: remove use of deprecated bundleOf

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2026-03-15 22:25:56 +01:00
parent 3b1673584b
commit ba7edf3e3e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/src/main/java/com/wireguard/android/fragment/AddTunnelsSheet.kt
+3 -4
View File
@@ -12,7 +12,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.ViewTreeObserver import android.view.ViewTreeObserver
import android.widget.FrameLayout import android.widget.FrameLayout
import androidx.core.os.bundleOf
import androidx.fragment.app.setFragmentResult import androidx.fragment.app.setFragmentResult
import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -83,15 +82,15 @@ class AddTunnelsSheet : BottomSheetDialogFragment() {
} }
private fun onRequestCreateConfig() { private fun onRequestCreateConfig() {
setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_CREATE)) setFragmentResult(REQUEST_KEY_NEW_TUNNEL, Bundle().apply { putString(REQUEST_METHOD, REQUEST_CREATE) })
} }
private fun onRequestImportConfig() { private fun onRequestImportConfig() {
setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_IMPORT)) setFragmentResult(REQUEST_KEY_NEW_TUNNEL, Bundle().apply { putString(REQUEST_METHOD, REQUEST_IMPORT) })
} }
private fun onRequestScanQRCode() { private fun onRequestScanQRCode() {
setFragmentResult(REQUEST_KEY_NEW_TUNNEL, bundleOf(REQUEST_METHOD to REQUEST_SCAN)) setFragmentResult(REQUEST_KEY_NEW_TUNNEL, Bundle().apply { putString(REQUEST_METHOD, REQUEST_SCAN) })
} }
companion object { companion object {
ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+5 -5
View File
@@ -14,7 +14,6 @@ import android.os.Bundle
import android.widget.Button import android.widget.Button
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.os.bundleOf
import androidx.databinding.Observable import androidx.databinding.Observable
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.fragment.app.setFragmentResult import androidx.fragment.app.setFragmentResult
@@ -145,10 +144,11 @@ class AppListDialogFragment : DialogFragment() {
} }
} }
setFragmentResult( setFragmentResult(
REQUEST_SELECTION, bundleOf( REQUEST_SELECTION,
KEY_SELECTED_APPS to selectedApps.toTypedArray(), Bundle().apply {
KEY_IS_EXCLUDED to (tabs?.selectedTabPosition == 0) putStringArray(KEY_SELECTED_APPS, selectedApps.toTypedArray())
) putBoolean(KEY_IS_EXCLUDED, tabs?.selectedTabPosition == 0)
}
) )
dismiss() dismiss()
} }