diff --git a/app/build.gradle b/app/build.gradle index 99f64859..8a44204b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,10 +11,10 @@ android { defaultConfig { applicationId "com.rtbishop.look4sat" - minSdkVersion 21 + minSdkVersion 23 targetSdkVersion 30 - versionCode 252 - versionName "2.5.2" + versionCode 253 + versionName "2.5.3" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 063b8042..19075d42 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:name=".presentation.Look4SatApplication" android:allowBackup="false" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name"> + android:label="@string/app_name" + android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/rtbishop/look4sat/injection/SatDataModule.kt b/app/src/main/java/com/rtbishop/look4sat/injection/SatDataModule.kt index 30180a0b..a9da2788 100644 --- a/app/src/main/java/com/rtbishop/look4sat/injection/SatDataModule.kt +++ b/app/src/main/java/com/rtbishop/look4sat/injection/SatDataModule.kt @@ -37,9 +37,11 @@ import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent import kotlinx.coroutines.CoroutineDispatcher +import okhttp3.OkHttpClient import retrofit2.Retrofit import retrofit2.converter.moshi.MoshiConverterFactory import javax.inject.Singleton +import javax.net.ssl.HostnameVerifier @Module @InstallIn(SingletonComponent::class) @@ -109,8 +111,11 @@ object SatDataModule { @Provides fun provideSatDataService(): SatDataService { + val verifier = HostnameVerifier { _, _ -> true } + val httpClient = OkHttpClient.Builder().hostnameVerifier(verifier).build() return Retrofit.Builder() .baseUrl("https://db.satnogs.org/api/") + .client(httpClient) .addConverterFactory(MoshiConverterFactory.create()) .build() .create(SatDataService::class.java) diff --git a/build.gradle b/build.gradle index c587bb85..73f4229d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,12 +9,12 @@ buildscript { navigation_version = '2.3.5' preference_version = '1.1.1' room_version = '2.3.0' - hilt_version = '2.36' + hilt_version = '2.37' retrofit_version = '2.9.0' osmdroid_version = '6.1.10' timber_version = '4.7.1' junit_version = '4.13.2' - mockito_version = '3.10.0' + mockito_version = '3.11.1' leak_canary_version = '2.7' } repositories { diff --git a/core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/PassPredictor.kt b/core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/PassPredictor.kt index ef79dcef..51a904fb 100644 --- a/core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/PassPredictor.kt +++ b/core/src/main/java/com/rtbishop/look4sat/domain/predict4kotlin/PassPredictor.kt @@ -19,7 +19,7 @@ package com.rtbishop.look4sat.domain.predict4kotlin import java.util.* -class PassPredictor(private val satellite: Satellite, private val gsp: StationPosition) { +class PassPredictor(private val satellite: Satellite, private val stationPos: StationPosition) { private val oneQuarterOrbitMin = (24.0 * 60.0 / satellite.tle.meanmo / 4.0).toInt() private val speedOfLight = 2.99792458E8 @@ -35,7 +35,7 @@ class PassPredictor(private val satellite: Satellite, private val gsp: StationPo } fun getSatPos(date: Date): SatPos { - return satellite.getPosition(gsp, date) + return satellite.getPosition(stationPos, date) } fun getPositions(refDate: Date, stepSec: Int, minBefore: Int, orbits: Double): List { @@ -58,7 +58,7 @@ class PassPredictor(private val satellite: Satellite, private val gsp: StationPo var shouldWindBack = windBack var lastAosDate: Date var count = 0 - if (satellite.willBeSeen(gsp)) { + if (satellite.willBeSeen(stationPos)) { if (satellite.tle.isDeepspace) { passes.add(nextDeepSpacePass(refDate)) } else { diff --git a/fastlane/metadata/android/en-US/changelogs/253.txt b/fastlane/metadata/android/en-US/changelogs/253.txt new file mode 100644 index 00000000..c25402dc --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/253.txt @@ -0,0 +1,2 @@ +Bumped minSdk to 23 (Android 6.0), fixed AMSat SSL issue +Dependencies update, fixed issue #58 \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US index 0356bdb9..c25402dc 100644 --- a/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US +++ b/fastlane/metadata/android/en-US/whatsnew/whatsnew-en-US @@ -1,10 +1,2 @@ -Added immediate initial setup -Added pass direction arrow to radar view #52 -Added orientation pointer to radar view -Fixed update triggered crash -Fixed radar view update bug #51 -Fixed tle update issue #53 -Fixed location update bug #54 -Removed aiming icon without sensors #57 -Removed satellite list scroll to the top on selection #59 -Switched to modular architecture \ No newline at end of file +Bumped minSdk to 23 (Android 6.0), fixed AMSat SSL issue +Dependencies update, fixed issue #58 \ No newline at end of file