Restore private on #1875's widened members; disable SyntheticAccessor (#1912) (#1926)

#1875 widened 34 declarations to clear lint's SyntheticAccessor findings:
file-`private` Kotlin helpers → `internal` (app-global in this single-module
app) and Java `private` → package-private. That traded real encapsulation for a
micro-optimization the toolchain already erases — release builds enable R8 with
`-allowaccessmodification` (#1868), which inlines/strips the synthetic accessors,
and in debug the cost is a handful of trivial methods. Leaving the check enabled
also taxed every future file-private helper called from a sibling class.

- Opt SyntheticAccessor out in the lint `disable` block with a rationale.
- Revert all 34 declarations to `private` (23 Kotlin `internal`→`private`,
  11 Java package-private→`private`). Verified each is accessed only within its
  own file (Kotlin) or only inner↔outer within its own class (Java), so
  narrowing does not break any caller.

No behavior change — visibility only. Compile (`-PwarningsAsErrors=true`,
obaGoogle Kotlin + Java) passes clean.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: bmander

onebusaway-android/build.gradle.kts

@@ -190,11 +190,20 @@ android {
         //    (RouteMapController's `vehicleJob?.isActive`). The one hit is benign and has no cleaner call.
         //  - ConvertToWebp: an advisory "this image could be smaller as WebP" nudge (wmata.jpg), not a
         //    correctness signal. Declined.
+        //  - SyntheticAccessor: flags a `private` member accessed across the class/file boundary, whose
+        //    only cost is a compiler-generated accessor method. Satisfying it forces widening real
+        //    encapsulation — file-`private` Kotlin helpers → `internal` (app-global in this single-module
+        //    app) and Java `private` → package-private — for a micro-optimization the toolchain already
+        //    erases: release enables R8 with `-allowaccessmodification` (#1868), which inlines/strips the
+        //    accessors, and in debug the cost is a handful of trivial methods. Leaving it enabled taxes
+        //    every future file-private helper called from a sibling class. #1875 widened 34 declarations
+        //    to clear it; #1912 restored their `private` and opts the check out here.
         disable += setOf(
             "MissingTranslation", "ExtraTranslation", "LogNotTimber",
             "GradleDependency", "NewerVersionAvailable", "AndroidGradlePluginVersion",
             "OldTargetApi", "DuplicateStrings",
-            "InvalidPackage", "PermissionNamingConvention", "MemberExtensionConflict", "ConvertToWebp"
+            "InvalidPackage", "PermissionNamingConvention", "MemberExtensionConflict", "ConvertToWebp",
+            "SyntheticAccessor"
         )
         // Run the FULL lint catalog — including checks that are off by default and library-provided
         // ones (Compose, UseKtx, …) — so the checked set is comprehensive and current for the installed

onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/compose/GoogleComposeAdapter.kt

@@ -313,7 +313,7 @@ class GoogleComposeAdapter : ObaComposeMapAdapter {
  * routes through [routeMarkerTap] (reliable for every marker, static and dynamic, because the dynamic
  * markers move at only ~20Hz — see [FRAME_INTERVAL_NANOS]); an info-window tap deep links.
  */
-internal fun wireClicks(
+private fun wireClicks(
     map: GoogleMap,
     renderer: GoogleMapRenderer,
     infoWindows: GoogleInfoWindows,
@@ -395,7 +395,7 @@ private fun routeMarkerTap(
  * render, so the bubble reflects the latest poll (re-rendered via [GoogleInfoWindows.refresh]), not a
  * tap-time snapshot.
  */
-internal fun GoogleInfoWindows.openVehicleWindow(renderer: GoogleMapRenderer, marker: Marker) {
+private fun GoogleInfoWindows.openVehicleWindow(renderer: GoogleMapRenderer, marker: Marker) {
     open(marker) {
         val live = renderer.vehicleForMarker(marker)
         // Deliberate snapshot read, not a reactive subscription: this content is rendered to a bitmap on
@@ -408,7 +408,7 @@ internal fun GoogleInfoWindows.openVehicleWindow(renderer: GoogleMapRenderer, ma
 }
 
 /** Builds a [CameraSnapshot] from the Google map's current camera + visible region. */
-internal fun snapshot(map: GoogleMap): CameraSnapshot {
+private fun snapshot(map: GoogleMap): CameraSnapshot {
     val pos = map.cameraPosition
     val bounds = map.projection.visibleRegion.latLngBounds
     val sw = bounds.southwest
@@ -424,13 +424,13 @@ internal fun snapshot(map: GoogleMap): CameraSnapshot {
 }
 
 @SuppressLint("MissingPermission")
-internal fun applyMyLocation(map: GoogleMap, context: Context, enabled: Boolean) {
+private fun applyMyLocation(map: GoogleMap, context: Context, enabled: Boolean) {
     val granted = PermissionUtils.hasGrantedAtLeastOnePermission(context, PermissionUtils.LOCATION_PERMISSIONS)
     map.isMyLocationEnabled = enabled && granted
 }
 
 /** The map style for the current night-mode state: the dark theme, or POI removal in light mode. */
-internal fun resolveMapStyle(context: Context): MapStyleOptions =
+private fun resolveMapStyle(context: Context): MapStyleOptions =
     if (ThemeUtils.isInDarkMode(context)) {
         MapStyleOptions.loadRawResourceStyle(context, R.raw.dark_map)
     } else {

onebusaway-android/src/main/java/org/onebusaway/android/analytics/UmamiAnalytics.java

@@ -82,7 +82,7 @@ public void run() {
         });
     }
 
-    void post(String payload) {
+    private void post(String payload) {
         HttpURLConnection conn = null;
         try {
             conn = (HttpURLConnection) new URL(mSendUrl).openConnection();

onebusaway-android/src/main/java/org/onebusaway/android/api/adapters/TripAdapters.kt

@@ -39,7 +39,7 @@ import kotlin.time.Duration.Companion.seconds
  * one-DTO-implements-the-interface pattern the map boundary uses for stops/routes.
  */
 
-internal fun Position.toLocation(): Location = locationOf(lat, lon)
+private fun Position.toLocation(): Location = locationOf(lat, lon)
 
 /** Presents a [TripStatus] DTO as an [ObaTripStatus]. */
 internal class DtoTripStatus(private val dto: TripStatus) : ObaTripStatus {

onebusaway-android/src/main/java/org/onebusaway/android/api/data/TripVehiclesDataSource.kt

@@ -66,7 +66,7 @@ private fun routeTripsOf(
  * double-record). Keying the dedup on `activeTripId` at this one wire→model seam fixes every consumer
  * at once; fall back to `tripId` when a status is absent, and preserve first-seen order.
  */
-internal fun List<TripDetailsEntry>.dedupeByActiveTripKeepingBestFix(): List<TripDetailsEntry> {
+private fun List<TripDetailsEntry>.dedupeByActiveTripKeepingBestFix(): List<TripDetailsEntry> {
     if (size < 2) return this
     val byKey = LinkedHashMap<String, TripDetailsEntry>(size)
     for (entry in this) {

onebusaway-android/src/main/java/org/onebusaway/android/app/di/LocationEntryPoint.kt

@@ -52,7 +52,7 @@ interface LocationEntryPoint {
         fun getSink(context: Context): LocationSink =
             accessor(context).locationSink()
 
-        internal fun accessor(context: Context): LocationEntryPoint =
+        private fun accessor(context: Context): LocationEntryPoint =
             EntryPointAccessors.fromApplication(context, LocationEntryPoint::class.java)
     }
 }

onebusaway-android/src/main/java/org/onebusaway/android/database/oba/LegacyDataImporter.kt

@@ -289,7 +289,7 @@ class LegacyDataImporter(
  * [map]; a null return from [map] drops that row. Returns an empty list for a missing table so a
  * legacy file at any historical schema version imports cleanly.
  */
-internal inline fun <T> SQLiteDatabase.read(table: String, map: Cursor.() -> T?): List<T> {
+private inline fun <T> SQLiteDatabase.read(table: String, map: Cursor.() -> T?): List<T> {
     if (!tableExists(table)) return emptyList()
     return query(table, null, null, null, null, null, null).use { c ->
         buildList { while (c.moveToNext()) c.map()?.let { add(it) } }
@@ -300,16 +300,16 @@ private fun SQLiteDatabase.tableExists(table: String): Boolean =
     rawQuery("SELECT name FROM sqlite_master WHERE type='table' AND name=?", arrayOf(table))
         .use { it.moveToFirst() }
 
-internal fun Cursor.str(name: String): String? =
+private fun Cursor.str(name: String): String? =
     columnIndex(name)?.takeIf { !isNull(it) }?.let { getString(it) }
 
-internal fun Cursor.int(name: String): Int? =
+private fun Cursor.int(name: String): Int? =
     columnIndex(name)?.takeIf { !isNull(it) }?.let { getInt(it) }
 
-internal fun Cursor.long(name: String): Long? =
+private fun Cursor.long(name: String): Long? =
     columnIndex(name)?.takeIf { !isNull(it) }?.let { getLong(it) }
 
-internal fun Cursor.dbl(name: String): Double? =
+private fun Cursor.dbl(name: String): Double? =
     columnIndex(name)?.takeIf { !isNull(it) }?.let { getDouble(it) }
 
 /** The column's index, or null when the legacy file's schema version predates that column. */

onebusaway-android/src/main/java/org/onebusaway/android/directions/util/DirectionsGenerator.kt

@@ -357,7 +357,7 @@ class DirectionsGenerator(
 
         private const val TAG = "DirectionsGenerator"
 
-        internal fun getOrdinal(number: Int, resources: Resources): String? {
+        private fun getOrdinal(number: Int, resources: Resources): String? {
             return when (number) {
                 1 -> resources.getString(R.string.step_by_step_non_transit_roundabout_ordinal_first)
                 2 -> resources.getString(R.string.step_by_step_non_transit_roundabout_ordinal_second)

onebusaway-android/src/main/java/org/onebusaway/android/extrapolation/GammaExtrapolator.kt

@@ -125,7 +125,7 @@ internal fun buildH34SpeedDistribution(schedSpeedMps: Double): ProbDistribution
  * The scheduled segment speed (m/s) at a given distance along the trip, or null if the schedule has
  * too few stops or the distance is out of bounds. Only the gamma model conditions on schedule speed.
  */
-internal fun ObaTripSchedule.speedAtDistance(distanceAlongTrip: Double): Double? {
+private fun ObaTripSchedule.speedAtDistance(distanceAlongTrip: Double): Double? {
     if (stopTimes.size < 2) return null
 
     val segmentStart = try {

onebusaway-android/src/main/java/org/onebusaway/android/extrapolation/math/prob/GammaDistribution.kt

@@ -56,7 +56,7 @@ class GammaDistribution(@JvmField val alpha: Double, @JvmField val scale: Double
         private const val MAX_ITERATIONS = 200
         private const val EPSILON = 1e-10
 
-        internal fun regularizedGammaP(a: Double, x: Double): Double {
+        private fun regularizedGammaP(a: Double, x: Double): Double {
             if (x <= 0) return 0.0
 
             return if (x < a + 1) {