Skip to content

Commit 5d520a8

Browse files
remove unused suppressions
1 parent 1b49d31 commit 5d520a8

34 files changed

+43
-83
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ libs
1212
release
1313
*IntegrationTest.java
1414
*IntegrationTest.kt
15+
androidkeystore*

app/build.gradle

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ android {
7777
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
7878
}
7979

80+
signingConfigs {
81+
release {
82+
}
83+
}
84+
8085
buildFeatures {
8186
viewBinding = true
8287
}
@@ -86,7 +91,7 @@ android {
8691
minifyEnabled true
8792
shrinkResources true
8893
proguardFiles getDefaultProguardFile("proguard-android.txt")
89-
signingConfig
94+
signingConfig signingConfigs.release
9095
}
9196
debug {
9297
applicationIdSuffix ".BETA"
@@ -130,15 +135,18 @@ allOpen {
130135
}
131136

132137
// keystore -------------------------------------------------
133-
if (project.hasProperty("keyAlias")) {
134-
def propertiesFile = file("../../keystores/androidkeystore.properties")
135-
Properties properties = readProperties(propertiesFile)
138+
signingConfig()
139+
140+
def signingConfig() {
141+
if (isReleaseTask()) {
142+
Properties properties = readProperties(file("androidkeystore.properties"))
136143

137-
System.out.println(">>> Signing Config " + properties)
138-
android.buildTypes.release.signingConfig.keyAlias = properties["key_alias"].toString()
139-
android.buildTypes.release.signingConfig.keyPassword = properties["key_password"].toString()
140-
android.buildTypes.release.signingConfig.storeFile = file(properties["store_filename"].toString())
141-
android.buildTypes.release.signingConfig.storePassword = properties["store_password"].toString()
144+
System.out.println(">>> Signing Config " + properties)
145+
android.buildTypes.release.signingConfig.keyAlias = properties["key_alias"].toString()
146+
android.buildTypes.release.signingConfig.keyPassword = properties["key_password"].toString()
147+
android.buildTypes.release.signingConfig.storeFile = file(properties["store_filename"].toString())
148+
android.buildTypes.release.signingConfig.storePassword = properties["store_password"].toString()
149+
}
142150
}
143151

144152
// version -------------------------------------------------

app/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Build Properties
2-
#Fri Apr 18 09:42:51 EDT 2025
3-
version_build=10
2+
#Sat Apr 26 11:03:33 EDT 2025
3+
version_build=11
44
version_major=3
55
version_minor=2
66
version_patch=0

app/src/main/java/com/jjoe64/graphview/series/TitleLineGraphSeries.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828

2929
import java.util.Iterator;
3030

31-
import androidx.core.view.ViewCompat;
32-
3331
/*
3432
modified version of com.jjoe64.graphview.series.LineGraphSeries
3533
*/
@@ -322,7 +320,7 @@ public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) {
322320
startXAnimated = (startX - lastAnimationReferenceX) * factor + lastAnimationReferenceX;
323321
startXAnimated = Math.max(startXAnimated, lastAnimationReferenceX);
324322
endXAnimated = (endX - lastAnimationReferenceX) * factor + lastAnimationReferenceX;
325-
ViewCompat.postInvalidateOnAnimation(graphView);
323+
graphView.postInvalidateOnAnimation();
326324
} else {
327325
// animation finished
328326
mLastAnimatedValue = valueX;
@@ -414,7 +412,7 @@ public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) {
414412
float factor = mAnimationInterpolator.getInterpolation(timeFactor);
415413
if (timeFactor <= 1.0) {
416414
first_X = (first_X - lastAnimationReferenceX) * factor + lastAnimationReferenceX;
417-
ViewCompat.postInvalidateOnAnimation(graphView);
415+
graphView.postInvalidateOnAnimation();
418416
} else {
419417
// animation finished
420418
mLastAnimatedValue = valueX;

app/src/main/kotlin/com/vrem/util/CompatUtils.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,4 @@ fun ScanResult.ssid(): String =
5858
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
5959
private fun ScanResult.ssidAndroidT(): String = String.nullToEmpty(wifiSsid?.toString())
6060

61-
@Suppress("DEPRECATION")
6261
private fun ScanResult.ssidLegacy(): String = String.nullToEmpty(SSID)

app/src/main/kotlin/com/vrem/util/LocaleUtils.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,14 @@
1717
*/
1818
package com.vrem.util
1919

20-
import android.annotation.SuppressLint
2120
import java.util.Locale
2221
import java.util.SortedMap
2322

2423
private object SyncAvoid {
25-
@SuppressLint("ConstantLocale")
2624
val defaultLocale: Locale = Locale.getDefault()
2725
val countryCodes: Set<String> = Locale.getISOCountries().toSet()
2826
val availableLocales: List<Locale> = Locale.getAvailableLocales().filter { countryCodes.contains(it.country) }
2927

30-
@SuppressLint("ConstantLocale")
3128
val countriesLocales: SortedMap<String, Locale> =
3229
availableLocales
3330
.associateBy { it.country.toCapitalize(Locale.getDefault()) }

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,8 @@ class NavigationMenuController(
5959

6060
init {
6161
NavigationGroup.entries.forEach { it.populateMenuItems(navigationView.menu) }
62-
@Suppress("LeakingThis")
6362
navigationView.setNavigationItemSelectedListener(navigationMenuControl)
64-
@Suppress("LeakingThis")
6563
NavigationGroup.GROUP_FEATURE.populateMenuItems(bottomNavigationView.menu)
66-
@Suppress("LeakingThis")
6764
bottomNavigationView.setOnItemSelectedListener(navigationMenuControl)
6865
}
6966
}

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/options/OptionMenu.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
package com.vrem.wifianalyzer.navigation.options
1919

20-
import android.annotation.SuppressLint
2120
import android.app.Activity
2221
import android.view.Menu
2322
import android.view.MenuItem
@@ -37,7 +36,6 @@ class OptionMenu {
3736

3837
fun select(item: MenuItem): Unit = OptionAction.findOptionAction(item.itemId).action()
3938

40-
@SuppressLint("RestrictedApi")
4139
private fun iconsVisible(menu: Menu) {
4240
try {
4341
(menu as MenuBuilder).setOptionalIconsVisible(true)

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/filter/adapter/StrengthAdapter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
*/
1818
package com.vrem.wifianalyzer.wifi.filter.adapter
1919

20+
import com.vrem.wifianalyzer.R
2021
import com.vrem.wifianalyzer.settings.Settings
2122
import com.vrem.wifianalyzer.wifi.model.Strength
2223

2324
class StrengthAdapter(selections: Set<Strength>) : EnumFilterAdapter<Strength>(selections, Strength.entries) {
2425
override fun color(selection: Strength): Int =
25-
if (selections.contains(selection)) selection.colorResource else Strength.COLOR_RESOURCE_DEFAULT
26+
if (selections.contains(selection)) selection.colorResource else R.color.regular
2627

2728
override fun save(settings: Settings): Unit =
2829
settings.saveStrengths(selections)

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/manager/WiFiManagerWrapper.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
package com.vrem.wifianalyzer.wifi.manager
1919

20-
import android.annotation.SuppressLint
2120
import android.net.wifi.ScanResult
2221
import android.net.wifi.WifiInfo
2322
import android.net.wifi.WifiManager
@@ -50,23 +49,20 @@ class WiFiManagerWrapper(
5049
false
5150
}
5251

53-
@Suppress("DEPRECATION")
5452
fun startScan(): Boolean =
5553
try {
5654
wifiManager.startScan()
5755
} catch (e: Exception) {
5856
false
5957
}
6058

61-
@SuppressLint("MissingPermission")
6259
fun scanResults(): List<ScanResult> =
6360
try {
6461
wifiManager.scanResults ?: listOf()
6562
} catch (e: Exception) {
6663
listOf()
6764
}
6865

69-
@Suppress("DEPRECATION")
7066
fun wiFiInfo(): WifiInfo? =
7167
try {
7268
wifiManager.connectionInfo

0 commit comments

Comments
 (0)