Merge branch 'fix/ONT-3055_rtrsd_tickets' into 'develop'

Resolve ONT-3055 "Fix/ rtrsd tickets"

Closes ONT-3055

See merge request android/nettest!262

core/src/main/java/at/specure/data/repository/MeasurementRepositoryImpl.kt

@@ -74,7 +74,8 @@ class MeasurementRepositoryImpl @Inject constructor(
         var simCountry: String? = null
         var simOperatorName: String? = null
 
-        val networkInfo = (cellInfoWatcher.activeNetwork as CellNetworkInfo)
+        val networkInfo =
+            if (cellInfoWatcher.activeNetwork != null && cellInfoWatcher.activeNetwork is CellNetworkInfo) cellInfoWatcher.activeNetwork as CellNetworkInfo else null
 
         if (context.isReadPhoneStatePermitted() && isDualByMobile) {
             val subscription = subscriptionManager.activeSubscriptionInfoList.firstOrNull()

core/src/main/java/at/specure/di/CoreModule.kt

@@ -33,8 +33,6 @@ import at.specure.data.repository.NewsRepositoryImpl
 import at.specure.data.repository.SettingsRepository
 import at.specure.data.repository.SettingsRepositoryImpl
 import at.specure.data.repository.TestDataRepository
-import at.specure.info.cell.ActiveDataCellInfoExtractor
-import at.specure.info.cell.ActiveDataCellInfoExtractorImpl
 import at.specure.info.cell.CellInfoWatcher
 import at.specure.info.cell.CellInfoWatcherImpl
 import at.specure.info.connectivity.ConnectivityWatcher
@@ -72,20 +70,12 @@ class CoreModule {
     @Provides
     @Singleton
     fun provideSignalStrengthWatcher(
-        context: Context,
-        netmonster: INetMonster,
-        subscriptionManager: SubscriptionManager,
-        telephonyManager: TelephonyManager,
         activeNetworkWatcher: ActiveNetworkWatcher,
         wifiInfoWatcher: WifiInfoWatcher,
         cellInfoWatcher: CellInfoWatcher,
         locationAccess: LocationAccess
     ): SignalStrengthWatcher =
         SignalStrengthWatcherImpl(
-            context,
-            netmonster,
-            subscriptionManager,
-            telephonyManager,
             activeNetworkWatcher,
             wifiInfoWatcher,
             cellInfoWatcher,
@@ -114,15 +104,6 @@ class CoreModule {
     fun providePermissionsWatcher(context: Context, locationAccess: LocationAccess, phoneStateAccess: PhoneStateAccess): PermissionsWatcher =
         PermissionsWatcher(context, locationAccess, phoneStateAccess)
 
-    @Provides
-    @Singleton
-    fun provideActiveDataCellInfoExtractor(
-        context: Context,
-        telephonyManager: TelephonyManager,
-        subscriptionManager: SubscriptionManager,
-        connectivityManager: ConnectivityManager
-    ): ActiveDataCellInfoExtractor = ActiveDataCellInfoExtractorImpl(context, telephonyManager, subscriptionManager, connectivityManager)
-
     @Provides
     @Singleton
     fun provideCellInfoWatcher(