From cb5d8600d5a6722a9704d830e5313d789f10c701 Mon Sep 17 00:00:00 2001 From: int314 <77012577+314systems@users.noreply.github.com> Date: Sun, 22 Feb 2026 17:32:00 +0900 Subject: [PATCH 1/2] remove OpenClass annotation and kotlin-allopen plugin --- app/build.gradle | 5 ----- .../kotlin/com/vrem/annotation/OpenClass.kt | 22 ------------------- .../com/vrem/wifianalyzer/Configuration.kt | 2 -- .../com/vrem/wifianalyzer/DrawerNavigation.kt | 2 -- .../com/vrem/wifianalyzer/MainActivity.kt | 2 -- .../vrem/wifianalyzer/export/ExportIntent.kt | 2 -- .../navigation/NavigationMenuController.kt | 2 -- .../navigation/options/OptionMenu.kt | 2 -- .../permission/ApplicationPermission.kt | 2 -- .../permission/LocationPermission.kt | 2 -- .../permission/PermissionDialog.kt | 2 -- .../permission/PermissionService.kt | 2 -- .../vrem/wifianalyzer/settings/Settings.kt | 2 -- .../vrem/wifianalyzer/vendor/VendorAdapter.kt | 2 -- .../vendor/model/VendorService.kt | 2 -- .../wifi/accesspoint/AccessPointDetail.kt | 2 -- .../wifi/accesspoint/AccessPointPopup.kt | 2 -- .../wifi/accesspoint/AccessPointsAdapter.kt | 2 -- .../accesspoint/AccessPointsAdapterData.kt | 2 -- .../accesspoint/AccessPointsAdapterGroup.kt | 2 -- .../wifi/channelgraph/ChannelGraphView.kt | 2 -- .../wifi/channelgraph/DataManager.kt | 2 -- .../wifi/filter/adapter/BasicFilterAdapter.kt | 4 +--- .../wifi/filter/adapter/EnumFilterAdapter.kt | 2 +- .../wifi/filter/adapter/FiltersAdapter.kt | 2 -- .../wifi/graphutils/GraphColors.kt | 2 -- .../wifi/graphutils/GraphViewWrapper.kt | 2 -- .../wifi/graphutils/SeriesCache.kt | 2 -- .../wifi/graphutils/SeriesOptions.kt | 2 -- .../wifi/manager/WiFiManagerWrapper.kt | 2 -- .../wifianalyzer/wifi/manager/WiFiSwitch.kt | 2 -- .../wifianalyzer/wifi/model/ChannelRating.kt | 2 -- .../vrem/wifianalyzer/wifi/model/WiFiData.kt | 2 -- .../vrem/wifianalyzer/wifi/scanner/Cache.kt | 2 -- .../wifianalyzer/wifi/scanner/PeriodicScan.kt | 2 -- .../wifi/scanner/ScanResultsReceiver.kt | 2 -- .../vrem/wifianalyzer/wifi/scanner/Scanner.kt | 2 -- .../wifi/scanner/ScannerCallback.kt | 2 -- .../wifianalyzer/wifi/scanner/Transformer.kt | 2 -- .../wifi/timegraph/DataManager.kt | 2 -- .../wifi/timegraph/TimeGraphCache.kt | 2 -- .../wifi/timegraph/TimeGraphView.kt | 2 -- .../org.mockito.plugins.MockMaker | 1 + build.gradle | 1 - 44 files changed, 3 insertions(+), 108 deletions(-) delete mode 100644 app/src/main/kotlin/com/vrem/annotation/OpenClass.kt create mode 100644 app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/app/build.gradle b/app/build.gradle index 50c7c0c36..604492450 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,6 @@ plugins { id "com.android.application" id "kotlin-android" - id "kotlin-allopen" id "jacoco" id "org.jlleitschuh.gradle.ktlint" version "14.0.1" } @@ -131,10 +130,6 @@ android { } } -allOpen { - annotation("com.vrem.annotation.OpenClass") -} - // keystore ------------------------------------------------- signingConfig() diff --git a/app/src/main/kotlin/com/vrem/annotation/OpenClass.kt b/app/src/main/kotlin/com/vrem/annotation/OpenClass.kt deleted file mode 100644 index 5437a0302..000000000 --- a/app/src/main/kotlin/com/vrem/annotation/OpenClass.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * WiFiAnalyzer - * Copyright (C) 2015 - 2026 VREM Software Development - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ - -package com.vrem.annotation - -@Target(AnnotationTarget.CLASS) -annotation class OpenClass diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt index f143a48ac..8664ccdbc 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt @@ -17,12 +17,10 @@ */ package com.vrem.wifianalyzer -import com.vrem.annotation.OpenClass const val SIZE_MIN = 1024 const val SIZE_MAX = 4096 -@OpenClass class Configuration( val largeScreen: Boolean, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/DrawerNavigation.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/DrawerNavigation.kt index 463877b64..d3726b48d 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/DrawerNavigation.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/DrawerNavigation.kt @@ -21,9 +21,7 @@ import android.content.res.Configuration import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.widget.Toolbar import androidx.drawerlayout.widget.DrawerLayout -import com.vrem.annotation.OpenClass -@OpenClass class DrawerNavigation( private val mainActivity: MainActivity, private val toolbar: Toolbar, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt index c08640a76..6245dbcd2 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt @@ -30,7 +30,6 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import com.google.android.material.navigation.NavigationView -import com.vrem.annotation.OpenClass import com.vrem.util.createContext import com.vrem.wifianalyzer.navigation.NavigationMenu import com.vrem.wifianalyzer.navigation.NavigationMenuControl @@ -41,7 +40,6 @@ import com.vrem.wifianalyzer.settings.Settings import com.vrem.wifianalyzer.wifi.accesspoint.ConnectionView import com.vrem.wifianalyzer.wifi.scanner.ScannerService -@OpenClass class MainActivity : AppCompatActivity(), NavigationMenuControl, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/export/ExportIntent.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/export/ExportIntent.kt index c80c200b5..bbf51e92c 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/export/ExportIntent.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/export/ExportIntent.kt @@ -19,9 +19,7 @@ package com.vrem.wifianalyzer.export import android.content.Intent -import com.vrem.annotation.OpenClass -@OpenClass class ExportIntent { internal fun intent( title: String, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt index c8bc3a928..b1a1b5e15 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt @@ -23,10 +23,8 @@ import androidx.core.view.forEach import androidx.core.view.get import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.navigation.NavigationView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.R -@OpenClass class NavigationMenuController( navigationMenuControl: NavigationMenuControl, val drawerNavigationView: NavigationView = navigationMenuControl.findViewById(R.id.nav_drawer), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt index 9602edfc2..fc40d6b8b 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt @@ -22,10 +22,8 @@ import android.app.Activity import android.view.Menu import android.view.MenuItem import androidx.appcompat.view.menu.MenuBuilder -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.R -@OpenClass class OptionMenu { var menu: Menu? = null diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt index 767c706fd..c93cf3f36 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/ApplicationPermission.kt @@ -20,9 +20,7 @@ package com.vrem.wifianalyzer.permission import android.Manifest import android.app.Activity import android.content.pm.PackageManager -import com.vrem.annotation.OpenClass -@OpenClass class ApplicationPermission( private val activity: Activity, private val permissionDialog: PermissionDialog = PermissionDialog(activity), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/LocationPermission.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/LocationPermission.kt index a038227dc..3ee2a6e08 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/LocationPermission.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/LocationPermission.kt @@ -21,10 +21,8 @@ import android.app.Activity import android.location.LocationManager import android.os.Build import androidx.annotation.RequiresApi -import com.vrem.annotation.OpenClass import com.vrem.util.buildMinVersionP -@OpenClass class LocationPermission( private val activity: Activity, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionDialog.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionDialog.kt index e246996a5..1595946e3 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionDialog.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionDialog.kt @@ -21,11 +21,9 @@ import android.app.Activity import android.app.AlertDialog import android.content.DialogInterface import android.view.View -import com.vrem.annotation.OpenClass import com.vrem.util.buildMinVersionP import com.vrem.wifianalyzer.R -@OpenClass class PermissionDialog( private val activity: Activity, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionService.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionService.kt index 3fbfa6c5b..54ae6c750 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionService.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/permission/PermissionService.kt @@ -18,9 +18,7 @@ package com.vrem.wifianalyzer.permission import android.app.Activity -import com.vrem.annotation.OpenClass -@OpenClass class PermissionService( private val activity: Activity, private val locationPermission: LocationPermission = LocationPermission(activity), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt index acf95922c..fe2f0ced7 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt @@ -18,7 +18,6 @@ package com.vrem.wifianalyzer.settings import android.content.SharedPreferences.OnSharedPreferenceChangeListener -import com.vrem.annotation.OpenClass import com.vrem.util.buildMinVersionQ import com.vrem.util.defaultCountryCode import com.vrem.util.defaultLanguageTag @@ -40,7 +39,6 @@ import com.vrem.wifianalyzer.wifi.model.Strength import java.util.Locale import kotlin.enums.EnumEntries -@OpenClass class Settings( private val repository: Repository, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/VendorAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/VendorAdapter.kt index bf1a201fd..41fcbb2af 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/VendorAdapter.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/VendorAdapter.kt @@ -22,13 +22,11 @@ import android.view.View import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.TextView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.R import com.vrem.wifianalyzer.databinding.VendorDetailsBinding import com.vrem.wifianalyzer.vendor.model.VendorService -@OpenClass internal class VendorAdapter( context: Context, private val vendorService: VendorService, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt index 04201fc7f..290ec32f9 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/vendor/model/VendorService.kt @@ -18,14 +18,12 @@ package com.vrem.wifianalyzer.vendor.model import android.content.res.Resources -import com.vrem.annotation.OpenClass import com.vrem.util.EMPTY import com.vrem.util.readFile import com.vrem.wifianalyzer.R import java.util.Locale import java.util.TreeMap -@OpenClass class VendorService( private val resources: Resources, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt index e6edbfb03..9cef72df1 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetail.kt @@ -23,7 +23,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.LayoutRes import androidx.core.content.ContextCompat -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.R import com.vrem.wifianalyzer.wifi.model.WiFiAdditional @@ -31,7 +30,6 @@ import com.vrem.wifianalyzer.wifi.model.WiFiDetail import com.vrem.wifianalyzer.wifi.model.WiFiSecurity import com.vrem.wifianalyzer.wifi.model.WiFiSignal -@OpenClass class AccessPointDetail { fun makeView( convertView: View?, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointPopup.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointPopup.kt index 1e77bfc50..a4e569074 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointPopup.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointPopup.kt @@ -19,10 +19,8 @@ package com.vrem.wifianalyzer.wifi.accesspoint import android.app.AlertDialog import android.view.View -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass class AccessPointPopup { fun show(view: View): AlertDialog { val alertDialog: AlertDialog = diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapter.kt index f9bba3786..c20be837b 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapter.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapter.kt @@ -22,13 +22,11 @@ import android.view.ViewGroup import android.widget.BaseExpandableListAdapter import android.widget.ExpandableListView import android.widget.ImageView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.R import com.vrem.wifianalyzer.wifi.model.WiFiData import com.vrem.wifianalyzer.wifi.model.WiFiDetail import com.vrem.wifianalyzer.wifi.scanner.UpdateNotifier -@OpenClass class AccessPointsAdapter( private val accessPointsAdapterData: AccessPointsAdapterData = AccessPointsAdapterData(), private val accessPointDetail: AccessPointDetail = AccessPointDetail(), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterData.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterData.kt index 690b6fd71..e3ab2e96d 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterData.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterData.kt @@ -18,7 +18,6 @@ package com.vrem.wifianalyzer.wifi.accesspoint import android.widget.ExpandableListView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.SIZE_MAX import com.vrem.wifianalyzer.SIZE_MIN @@ -30,7 +29,6 @@ import com.vrem.wifianalyzer.wifi.model.WiFiDetail import com.vrem.wifianalyzer.wifi.predicate.makeAccessPointsPredicate import java.security.MessageDigest -@OpenClass class AccessPointsAdapterData( private val accessPointsAdapterGroup: AccessPointsAdapterGroup = AccessPointsAdapterGroup(), val wiFiDetails: MutableList = mutableListOf(), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt index 3f6076826..2f8331c11 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointsAdapterGroup.kt @@ -18,12 +18,10 @@ package com.vrem.wifianalyzer.wifi.accesspoint import android.widget.ExpandableListView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.wifi.model.GroupBy import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass class AccessPointsAdapterGroup( val expanded: MutableSet = mutableSetOf(), var groupBy: GroupBy = GroupBy.NONE, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt index afb93a31e..54078c9bd 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt @@ -20,7 +20,6 @@ package com.vrem.wifianalyzer.wifi.channelgraph import android.view.View import com.jjoe64.graphview.GraphView import com.jjoe64.graphview.series.TitleLineGraphSeries -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.R import com.vrem.wifianalyzer.settings.Settings @@ -83,7 +82,6 @@ internal fun makeGraphViewWrapper(wiFiBand: WiFiBand): GraphViewWrapper { return graphViewWrapper } -@OpenClass internal class ChannelGraphView( private val wiFiBand: WiFiBand, private var dataManager: DataManager = DataManager(), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/DataManager.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/DataManager.kt index 41d75ad5e..31893e6a2 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/DataManager.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/DataManager.kt @@ -18,13 +18,11 @@ package com.vrem.wifianalyzer.wifi.channelgraph import com.jjoe64.graphview.series.TitleLineGraphSeries -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.graphutils.GraphDataPoint import com.vrem.wifianalyzer.wifi.graphutils.GraphViewWrapper import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass internal class DataManager { fun newSeries(wiFiDetails: List): Set = wiFiDetails.toSet() diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/BasicFilterAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/BasicFilterAdapter.kt index 5573e9fee..94312d3ca 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/BasicFilterAdapter.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/BasicFilterAdapter.kt @@ -17,12 +17,10 @@ */ package com.vrem.wifianalyzer.wifi.filter.adapter -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.settings.Settings -@OpenClass abstract class BasicFilterAdapter( - var selections: Set, + open var selections: Set, ) { fun selections(selections: Set) { this.selections = selections diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/EnumFilterAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/EnumFilterAdapter.kt index fff195983..ea97103e7 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/EnumFilterAdapter.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/EnumFilterAdapter.kt @@ -42,7 +42,7 @@ abstract class EnumFilterAdapter>( selections(defaults.toSet()) } - fun color(selection: T): Int = if (selections.contains(selection)) R.color.selected else R.color.regular + open fun color(selection: T): Int = if (selections.contains(selection)) R.color.selected else R.color.regular fun contains(selection: T): Boolean = selections.contains(selection) } diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/FiltersAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/FiltersAdapter.kt index cac2344c0..7201cb247 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/FiltersAdapter.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/FiltersAdapter.kt @@ -17,13 +17,11 @@ */ package com.vrem.wifianalyzer.wifi.filter.adapter -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.navigation.NavigationMenu import com.vrem.wifianalyzer.settings.Settings import java.io.Serializable -@OpenClass class FiltersAdapter( private val settings: Settings, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphColors.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphColors.kt index 6c5ed5939..6309ac961 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphColors.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphColors.kt @@ -17,7 +17,6 @@ */ package com.vrem.wifianalyzer.wifi.graphutils -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.R @@ -30,7 +29,6 @@ data class GraphColor( internal val transparent = GraphColor(0x009E9E9E, 0x009E9E9E) -@OpenClass class GraphColors { private val availableGraphColors: MutableList = mutableListOf() private val currentGraphColors: ArrayDeque = ArrayDeque() diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewWrapper.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewWrapper.kt index 4e640dd39..66819f3e9 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewWrapper.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/GraphViewWrapper.kt @@ -22,7 +22,6 @@ import com.jjoe64.graphview.LegendRenderer import com.jjoe64.graphview.series.BaseSeries import com.jjoe64.graphview.series.DataPointInterface import com.jjoe64.graphview.series.Series -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.SIZE_MAX import com.vrem.wifianalyzer.SIZE_MIN @@ -32,7 +31,6 @@ import com.vrem.wifianalyzer.wifi.accesspoint.AccessPointPopup import com.vrem.wifianalyzer.wifi.model.WiFiDetail import java.security.MessageDigest -@OpenClass class GraphViewWrapper( val graphView: GraphView, var graphLegend: GraphLegend, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesCache.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesCache.kt index 3d4c35499..49e8eb2c9 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesCache.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesCache.kt @@ -19,10 +19,8 @@ package com.vrem.wifianalyzer.wifi.graphutils import com.jjoe64.graphview.series.BaseSeries import com.jjoe64.graphview.series.Series -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass class SeriesCache { private val cache: MutableMap> = mutableMapOf() diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesOptions.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesOptions.kt index ee11207c5..0708f3fc8 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesOptions.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/graphutils/SeriesOptions.kt @@ -20,7 +20,6 @@ package com.vrem.wifianalyzer.wifi.graphutils import com.jjoe64.graphview.series.BaseSeries import com.jjoe64.graphview.series.LineGraphSeries import com.jjoe64.graphview.series.TitleLineGraphSeries -import com.vrem.annotation.OpenClass private fun BaseSeries.removeSeriesColor(graphColors: GraphColors) = graphColors.addColor(this.color.toLong()) @@ -55,7 +54,6 @@ private fun BaseSeries.drawBackground(drawBackground: Boolean) { } } -@OpenClass class SeriesOptions( private val graphColors: GraphColors = GraphColors(), ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiManagerWrapper.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiManagerWrapper.kt index 5a52fc17d..00731eaa3 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiManagerWrapper.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiManagerWrapper.kt @@ -23,10 +23,8 @@ import android.net.wifi.WifiInfo import android.net.wifi.WifiManager import android.os.Build import androidx.annotation.RequiresApi -import com.vrem.annotation.OpenClass import com.vrem.util.buildMinVersionR -@OpenClass class WiFiManagerWrapper( private val wifiManager: WifiManager, private val wiFiSwitch: WiFiSwitch = WiFiSwitch(wifiManager), diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiSwitch.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiSwitch.kt index 38ac46c91..e0bb18b5e 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiSwitch.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiSwitch.kt @@ -20,12 +20,10 @@ package com.vrem.wifianalyzer.wifi.manager import android.net.wifi.WifiManager import android.os.Build import androidx.annotation.RequiresApi -import com.vrem.annotation.OpenClass import com.vrem.util.buildMinVersionQ import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.startWiFiSettings -@OpenClass class WiFiSwitch( private val wifiManager: WifiManager, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/ChannelRating.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/ChannelRating.kt index 9b4ad4e4d..acc79f0e2 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/ChannelRating.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/ChannelRating.kt @@ -17,11 +17,9 @@ */ package com.vrem.wifianalyzer.wifi.model -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.band.WiFiBand import com.vrem.wifianalyzer.wifi.band.WiFiChannel -@OpenClass class ChannelRating( val wiFiDetails: MutableList = mutableListOf(), ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiData.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiData.kt index f6b736dc4..e0932d544 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiData.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/WiFiData.kt @@ -17,11 +17,9 @@ */ package com.vrem.wifianalyzer.wifi.model -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.wifi.predicate.Predicate -@OpenClass class WiFiData( val wiFiDetails: List, val wiFiConnection: WiFiConnection, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Cache.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Cache.kt index 72ba39b81..41c3c4a41 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Cache.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Cache.kt @@ -19,7 +19,6 @@ package com.vrem.wifianalyzer.wifi.scanner import android.net.wifi.ScanResult import android.net.wifi.WifiInfo -import com.vrem.annotation.OpenClass import com.vrem.util.ssid import com.vrem.wifianalyzer.MainContext @@ -33,7 +32,6 @@ internal data class CacheKey( val ssid: String, ) -@OpenClass internal class Cache { private val scanResults: ArrayDeque> = ArrayDeque(MAXIMUM) private var count: Int = COUNT_MIN diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/PeriodicScan.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/PeriodicScan.kt index a0da9e45d..386401a67 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/PeriodicScan.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/PeriodicScan.kt @@ -18,10 +18,8 @@ package com.vrem.wifianalyzer.wifi.scanner import android.os.Handler -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.settings.Settings -@OpenClass internal class PeriodicScan( private val scanner: ScannerService, private val handler: Handler, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt index aed183548..bd665f1df 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt @@ -22,14 +22,12 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.net.wifi.WifiManager -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainActivity fun interface Callback { // Compliant, function interface used fun onSuccess() } -@OpenClass internal class ScanResultsReceiver( private val mainActivity: MainActivity, private val callback: Callback, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Scanner.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Scanner.kt index 0fa590177..231cb54db 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Scanner.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Scanner.kt @@ -17,13 +17,11 @@ */ package com.vrem.wifianalyzer.wifi.scanner -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.permission.PermissionService import com.vrem.wifianalyzer.settings.Settings import com.vrem.wifianalyzer.wifi.manager.WiFiManagerWrapper import com.vrem.wifianalyzer.wifi.model.WiFiData -@OpenClass internal class Scanner( val wiFiManagerWrapper: WiFiManagerWrapper, val settings: Settings, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScannerCallback.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScannerCallback.kt index 20d50507e..237263bb0 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScannerCallback.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScannerCallback.kt @@ -17,10 +17,8 @@ */ package com.vrem.wifianalyzer.wifi.scanner -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.manager.WiFiManagerWrapper -@OpenClass internal class ScannerCallback( private val wiFiManagerWrapper: WiFiManagerWrapper, private val cache: Cache, diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt index f177790f5..618b6553b 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt @@ -18,7 +18,6 @@ package com.vrem.wifianalyzer.wifi.scanner import android.net.wifi.WifiInfo -import com.vrem.annotation.OpenClass import com.vrem.util.nullToEmpty import com.vrem.util.ssid import com.vrem.wifianalyzer.wifi.model.FastRoaming @@ -37,7 +36,6 @@ import com.vrem.wifianalyzer.wifi.model.convertSSID fun WifiInfo.ipV4Address(): Int = ipAddress -@OpenClass internal class Transformer( private val cache: Cache, ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt index 0d56eaace..0b6605ee2 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt @@ -18,7 +18,6 @@ package com.vrem.wifianalyzer.wifi.timegraph import com.jjoe64.graphview.series.LineGraphSeries -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.graphutils.GraphDataPoint import com.vrem.wifianalyzer.wifi.graphutils.GraphViewWrapper import com.vrem.wifianalyzer.wifi.graphutils.MAX_SCAN_COUNT @@ -26,7 +25,6 @@ import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y_OFFSET import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass internal class DataManager( private val timeGraphCache: TimeGraphCache = TimeGraphCache(), ) { diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphCache.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphCache.kt index 0e850f342..69aa53e31 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphCache.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphCache.kt @@ -17,11 +17,9 @@ */ package com.vrem.wifianalyzer.wifi.timegraph -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.wifi.graphutils.MAX_NOT_SEEN_COUNT import com.vrem.wifianalyzer.wifi.model.WiFiDetail -@OpenClass internal class TimeGraphCache { private val notSeen: MutableMap = mutableMapOf() diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphView.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphView.kt index bb12e8e7e..102334269 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphView.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/TimeGraphView.kt @@ -19,7 +19,6 @@ package com.vrem.wifianalyzer.wifi.timegraph import android.view.View import com.jjoe64.graphview.GraphView -import com.vrem.annotation.OpenClass import com.vrem.wifianalyzer.MainContext import com.vrem.wifianalyzer.R import com.vrem.wifianalyzer.settings.Settings @@ -56,7 +55,6 @@ internal fun makeGraphViewWrapper(): GraphViewWrapper { return graphViewWrapper } -@OpenClass internal class TimeGraphView( private val wiFiBand: WiFiBand, private val dataManager: DataManager = DataManager(), diff --git a/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker new file mode 100644 index 000000000..1f0955d45 --- /dev/null +++ b/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker @@ -0,0 +1 @@ +mock-maker-inline diff --git a/build.gradle b/build.gradle index 3292dce23..db93d27d3 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:9.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version" classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0" } } From 2a5321eac301bf364868e84c209e1c6b710dc373 Mon Sep 17 00:00:00 2001 From: int314 <77012577+314systems@users.noreply.github.com> Date: Sun, 22 Feb 2026 17:46:46 +0900 Subject: [PATCH 2/2] fixup! remove OpenClass annotation and kotlin-allopen plugin --- app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt index 8664ccdbc..69ae982a6 100644 --- a/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt +++ b/app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt @@ -17,7 +17,6 @@ */ package com.vrem.wifianalyzer - const val SIZE_MIN = 1024 const val SIZE_MAX = 4096