Change activity!! to requireActivity() to appease the linter.

tasn · tasn · commit 9b4661ec3fb6 · 2025-09-19T22:32:19.000-04:00
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt
@@ -125,7 +125,7 @@ class AccountSettingsFragment() : PreferenceFragmentCompat(), LoaderManager.Load
         // Category: encryption
         val prefEncryptionPassword = findPreference("password")
         prefEncryptionPassword.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-            startActivity(ChangeEncryptionPasswordActivity.newIntent(activity!!, account))
+            startActivity(ChangeEncryptionPasswordActivity.newIntent(requireActivity(), account))
             true
         }
 
@@ -202,14 +202,14 @@ class LegacyAccountSettingsFragment : PreferenceFragmentCompat(), LoaderManager.
 
     override fun onLoadFinished(loader: Loader<AccountSettings>, settings: AccountSettings?) {
         if (settings == null) {
-            activity!!.finish()
+            requireActivity().finish()
             return
         }
 
         // Category: dashboard
         val prefManageAccount = findPreference("manage_account")
         prefManageAccount.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-            WebViewActivity.openUrl(activity!!, Constants.dashboard.buildUpon().appendQueryParameter("email", account.name).build())
+            WebViewActivity.openUrl(requireActivity(), Constants.dashboard.buildUpon().appendQueryParameter("email", account.name).build())
             true
         }
 
@@ -225,7 +225,7 @@ class LegacyAccountSettingsFragment : PreferenceFragmentCompat(), LoaderManager.
         // Category: encryption
         val prefEncryptionPassword = findPreference("encryption_password")
         prefEncryptionPassword.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-            startActivity(ChangeEncryptionPasswordActivity.newIntent(activity!!, account))
+            startActivity(ChangeEncryptionPasswordActivity.newIntent(requireActivity(), account))
             true
         }
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/AddMemberFragment.kt
@@ -80,14 +80,14 @@ class AddMemberFragment : DialogFragment() {
                 val view = LayoutInflater.from(context).inflate(R.layout.fingerprint_alertdialog, null)
                 (view.findViewById<View>(R.id.body) as TextView).text = getString(R.string.trust_fingerprint_body, memberEmail)
                 (view.findViewById<View>(R.id.fingerprint) as TextView).text = fingerprint
-                AlertDialog.Builder(activity!!)
+                AlertDialog.Builder(requireActivity())
                         .setIcon(R.drawable.ic_fingerprint_dark)
                         .setTitle(R.string.trust_fingerprint_title)
                         .setView(view)
                         .setPositiveButton(android.R.string.ok) { _, _ -> MemberAddSecond().execute() }
                         .setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }.show()
             } else {
-                AlertDialog.Builder(activity!!)
+                AlertDialog.Builder(requireActivity())
                         .setIcon(R.drawable.ic_error_dark)
                         .setTitle(R.string.collection_members_add_error)
                         .setMessage(result.throwable.message)
@@ -131,7 +131,7 @@ class AddMemberFragment : DialogFragment() {
             if (result.throwable == null) {
                 (activity as Refreshable).refresh()
             } else {
-                AlertDialog.Builder(activity!!)
+                AlertDialog.Builder(requireActivity())
                         .setIcon(R.drawable.ic_error_dark)
                         .setTitle(R.string.collection_members_add_error)
                         .setMessage(result.throwable.message)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AppSettingsActivity.kt
@@ -176,7 +176,7 @@ class AppSettingsActivity : BaseActivity() {
         }
 
         private fun resetCertificates() {
-            if (CustomCertManager.resetCertificates(activity!!))
+            if (CustomCertManager.resetCertificates(requireActivity()))
                 Snackbar.make(requireView(), getString(R.string.app_settings_reset_certificates_success), Snackbar.LENGTH_LONG).show()
         }
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/RemoveMemberFragment.kt
@@ -66,7 +66,7 @@ class RemoveMemberFragment : DialogFragment() {
             if (result.throwable == null) {
                 (activity as Refreshable).refresh()
             } else {
-                AlertDialog.Builder(activity!!)
+                AlertDialog.Builder(requireActivity())
                         .setIcon(R.drawable.ic_error_dark)
                         .setTitle(R.string.collection_members_remove_error)
                         .setMessage(result.throwable.message)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/StartupDialogFragment.kt
@@ -41,7 +41,7 @@ class StartupDialogFragment : DialogFragment() {
 
         val mode = Mode.valueOf(arguments!!.getString(ARGS_MODE)!!)
         when (mode) {
-            StartupDialogFragment.Mode.BATTERY_OPTIMIZATIONS -> return AlertDialog.Builder(activity!!)
+            StartupDialogFragment.Mode.BATTERY_OPTIMIZATIONS -> return AlertDialog.Builder(requireActivity())
                     .setTitle(R.string.startup_battery_optimization)
                     .setMessage(R.string.startup_battery_optimization_message)
                     .setPositiveButton(android.R.string.ok) { dialog, which -> }
@@ -54,14 +54,14 @@ class StartupDialogFragment : DialogFragment() {
                     .setNegativeButton(R.string.startup_dont_show_again) { dialog, which -> HintManager.setHintSeen(context!!, HINT_BATTERY_OPTIMIZATIONS, true) }
                     .create()
 
-            StartupDialogFragment.Mode.DEVELOPMENT_VERSION -> return AlertDialog.Builder(activity!!)
+            StartupDialogFragment.Mode.DEVELOPMENT_VERSION -> return AlertDialog.Builder(requireActivity())
                     .setIcon(R.mipmap.ic_launcher)
                     .setTitle(R.string.startup_development_version)
                     .setMessage(R.string.startup_development_version_message)
                     .setPositiveButton(android.R.string.ok) { dialog, which -> }
                     .setNeutralButton(R.string.startup_development_version_give_feedback) { dialog, which -> startActivity(Intent(Intent.ACTION_VIEW, Constants.feedbackUri)) }
                     .create()
-            StartupDialogFragment.Mode.VENDOR_SPECIFIC_BUGS -> return AlertDialog.Builder(activity!!)
+            StartupDialogFragment.Mode.VENDOR_SPECIFIC_BUGS -> return AlertDialog.Builder(requireActivity())
                     .setTitle(R.string.startup_vendor_specific_bugs)
                     .setMessage(R.string.startup_vendor_specific_bugs_message)
                     .setPositiveButton(android.R.string.ok) { dialog, which -> }
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ImportFragment.kt
@@ -122,7 +122,7 @@ class ImportFragment : DialogFragment() {
                         val uri = data.data!!
                         Logger.log.info("Starting import into ${uid} from file ${uri}")
                         try {
-                            inputStream = activity!!.contentResolver.openInputStream(uri)
+                            inputStream = requireActivity().contentResolver.openInputStream(uri)
 
                             Thread(ImportEntriesLoader()).start()
                         } catch (e: Exception) {
@@ -163,15 +163,15 @@ class ImportFragment : DialogFragment() {
                 return
             }
 
-            activity!!.runOnUiThread { setDialogAddEntries(dialog as ProgressDialog, length) }
+            requireActivity().runOnUiThread { setDialogAddEntries(dialog as ProgressDialog, length) }
         }
 
         private fun entryProcessed() {
             if (activity == null) {
                 return
             }
 
-            activity!!.runOnUiThread {
+            requireActivity().runOnUiThread {
                 val dialog = dialog as ProgressDialog
 
                 dialog.incrementProgressBy(1)
@@ -181,7 +181,7 @@ class ImportFragment : DialogFragment() {
         override fun run() {
             val result = loadInBackground()
 
-            activity!!.runOnUiThread { loadFinished(result) }
+            requireActivity().runOnUiThread { loadFinished(result) }
         }
 
         fun loadInBackground(): ImportResult {
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
@@ -48,7 +48,7 @@ class LocalContactImportFragment : Fragment() {
         recyclerView = view.findViewById<View>(R.id.recyclerView) as RecyclerView
 
         recyclerView!!.layoutManager = LinearLayoutManager(activity)
-        recyclerView!!.addItemDecoration(DividerItemDecoration(activity!!))
+        recyclerView!!.addItemDecoration(DividerItemDecoration(requireActivity()))
         return view
     }
 
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/importlocal/ResultFragment.kt
@@ -44,7 +44,7 @@ class ResultFragment : DialogFragment() {
                     }
                     .create()
         } else {
-            return AlertDialog.Builder(activity!!)
+            return AlertDialog.Builder(requireActivity())
                     .setTitle(R.string.import_dialog_title)
                     .setIcon(R.drawable.ic_import_export_black)
                     .setMessage(getString(R.string.import_dialog_success, result!!.total, result!!.added, result!!.updated, result!!.skipped))
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/journalviewer/ListEntriesFragment.kt
@@ -47,7 +47,7 @@ class ListEntriesFragment : ListFragment(), AdapterView.OnItemClickListener {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        activity!!.title = info.displayName
+        requireActivity().title = info.displayName
         val view = inflater.inflate(R.layout.journal_viewer_list, container, false)
 
         //This is instead of setEmptyText() function because of Google bug
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/LoginCredentialsChangeFragment.kt
@@ -61,10 +61,10 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
                 val settings: AccountSettings
 
                 try {
-                    settings = AccountSettings(activity!!, account)
+                    settings = AccountSettings(requireActivity(), account)
                 } catch (e: InvalidAccountException) {
                     Logger.log.log(Level.INFO, "Account is invalid or doesn't exist (anymore)", e)
-                    activity!!.finish()
+                    requireActivity().finish()
                     return
                 }
 
@@ -82,7 +82,7 @@ class LoginCredentialsChangeFragment : DialogFragment(), LoaderManager.LoaderCal
     class NothingDetectedFragment : DialogFragment() {
 
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            return AlertDialog.Builder(activity!!)
+            return AlertDialog.Builder(requireActivity())
                     .setTitle(R.string.setting_up_encryption)
                     .setIcon(R.drawable.ic_error_dark)
                     .setMessage(R.string.login_wrong_username_or_password)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupEncryptionFragment.kt
@@ -55,7 +55,7 @@ class SetupEncryptionFragment : DialogFragment() {
         override fun onPostExecute(result: Configuration) {
             if (config.error != null && config.error is Exceptions.IntegrityException) {
                 Logger.log.severe("Wrong encryption password.")
-                AlertDialog.Builder(activity!!)
+                AlertDialog.Builder(requireActivity())
                         .setTitle(R.string.wrong_encryption_password)
                         .setIcon(R.drawable.ic_error_dark)
                         .setMessage(getString(R.string.wrong_encryption_password_content, config.error!!.localizedMessage))
@@ -65,12 +65,12 @@ class SetupEncryptionFragment : DialogFragment() {
             } else {
                 try {
                     if (createAccount(config.userName, config)) {
-                        activity!!.setResult(Activity.RESULT_OK)
-                        activity!!.finish()
+                        requireActivity().setResult(Activity.RESULT_OK)
+                        requireActivity().finish()
                     }
                 } catch (e: InvalidAccountException) {
                     Logger.log.severe("Account creation failed!")
-                    AlertDialog.Builder(activity!!)
+                    AlertDialog.Builder(requireActivity())
                             .setTitle(R.string.account_creation_failed)
                             .setIcon(R.drawable.ic_error_dark)
                             .setMessage(e.localizedMessage)
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/setup/SetupUserInfoFragment.kt
@@ -81,7 +81,7 @@ class SetupUserInfoFragment : DialogFragment() {
             if (result.exception == null) {
                 settings.keyPair = result.keyPair
             } else {
-                val dialog = AlertDialog.Builder(activity!!)
+                val dialog = AlertDialog.Builder(requireActivity())
                         .setTitle(R.string.login_user_info_error_title)
                         .setIcon(R.drawable.ic_error_dark)
                         .setMessage(result.exception.localizedMessage)

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ class AppSettingsActivity : BaseActivity() {`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`private fun resetCertificates() {`
`179`		`- if (CustomCertManager.resetCertificates(activity!!))`
	`179`	`+ if (CustomCertManager.resetCertificates(requireActivity()))`
`180`	`180`	`Snackbar.make(requireView(), getString(R.string.app_settings_reset_certificates_success), Snackbar.LENGTH_LONG).show()`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class LocalContactImportFragment : Fragment() {`
`48`	`48`	`recyclerView = view.findViewById<View>(R.id.recyclerView) as RecyclerView`
`49`	`49`
`50`	`50`	`recyclerView!!.layoutManager = LinearLayoutManager(activity)`
`51`		`- recyclerView!!.addItemDecoration(DividerItemDecoration(activity!!))`
	`51`	`+ recyclerView!!.addItemDecoration(DividerItemDecoration(requireActivity()))`
`52`	`52`	`return view`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class ResultFragment : DialogFragment() {`
`44`	`44`	`}`
`45`	`45`	`.create()`
`46`	`46`	`} else {`
`47`		`- return AlertDialog.Builder(activity!!)`
	`47`	`+ return AlertDialog.Builder(requireActivity())`
`48`	`48`	`.setTitle(R.string.import_dialog_title)`
`49`	`49`	`.setIcon(R.drawable.ic_import_export_black)`
`50`	`50`	`.setMessage(getString(R.string.import_dialog_success, result!!.total, result!!.added, result!!.updated, result!!.skipped))`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class ListEntriesFragment : ListFragment(), AdapterView.OnItemClickListener {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {`
`50`		`- activity!!.title = info.displayName`
	`50`	`+ requireActivity().title = info.displayName`
`51`	`51`	`val view = inflater.inflate(R.layout.journal_viewer_list, container, false)`
`52`	`52`
`53`	`53`	`//This is instead of setEmptyText() function because of Google bug`