Removed all ad-code, renamed huawei flavor to generic flavor

Author: patrickunterwegs

app/build.gradle

@@ -83,14 +83,14 @@ android {
             dimension 'version'
             versionNameSuffix '.gplay'
         }
-        huawei {
-            dimension 'version'
-            versionNameSuffix '.huawei'
-        }
         ose {
             dimension 'version'
             versionNameSuffix '.ose'
         }
+        generic {
+            dimension 'version'
+            versionNameSuffix '.generic'
+        }
     }
 
     // the flavor alphatest should not be used for the build type release, we filter this here
@@ -182,11 +182,6 @@ dependencies {
     gplayImplementation "com.google.android.gms:play-services-maps:18.1.0"
     gplayImplementation "com.google.android.gms:play-services-location:20.0.0"
 
-    // Huawei Ads Lite (works only on Huawei phones)
-    huaweiImplementation "com.huawei.hms:ads:3.4.49.301"    // should be replaced by ads-lite when it can be tested with a huawei phone
-    //implementation "com.huawei.hms:ads-lite:13.4.49.301"
-    huaweiImplementation "com.huawei.hms:ads-consent:3.4.49.301"
-
     // Workmanager support
     implementation "androidx.work:work-runtime-ktx:$version_work"
     androidTestImplementation "androidx.work:work-testing:$version_work"

…t/techbee/jtx/flavored/BillingManager.kt …t/techbee/jtx/flavored/BillingManager.ktapp/src/huawei/java/at/techbee/jtx/flavored/BillingManager.kt renamed to app/src/generic/java/at/techbee/jtx/flavored/BillingManager.kt app/src/huawei/java/at/techbee/jtx/flavored/BillingManager.kt renamed to app/src/generic/java/at/techbee/jtx/flavored/BillingManager.kt

@@ -32,7 +32,6 @@ import at.techbee.jtx.MainActivity2.Companion.BUILD_FLAVOR_GOOGLEPLAY
 import at.techbee.jtx.MainActivity2.Companion.BUILD_FLAVOR_OSE
 import at.techbee.jtx.database.Module
 import at.techbee.jtx.database.properties.Attachment
-import at.techbee.jtx.flavored.AdManager
 import at.techbee.jtx.flavored.BillingManager
 import at.techbee.jtx.flavored.JtxReviewManager
 import at.techbee.jtx.ui.GlobalStateHolder
@@ -74,7 +73,7 @@ const val AUTHORITY_FILEPROVIDER = "at.techbee.jtx.fileprovider"
 
         const val BUILD_FLAVOR_OSE = "ose"
         const val BUILD_FLAVOR_GOOGLEPLAY = "gplay"
-        const val BUILD_FLAVOR_HUAWEI = "huawei"
+        const val BUILD_FLAVOR_GENERIC = "generic"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -90,16 +89,8 @@ const val AUTHORITY_FILEPROVIDER = "at.techbee.jtx.fileprovider"
 
         TimeZoneRegistryFactory.getInstance().createRegistry() // necessary for ical4j
         createNotificationChannel()   // Register Notification Channel for Reminders
-
         BillingManager.getInstance().initialise(this)
 
-        /* TODO
-        billingManager?.isProPurchased?.observe(this) { isPurchased ->
-            if(!isPurchased)
-                AdManager.getInstance()?.checkOrRequestConsentAndLoadAds(this, applicationContext)
-        }
-         */
-
         setContent {
             val isProPurchased = BillingManager.getInstance().isProPurchased.observeAsState()
             JtxBoardTheme(
@@ -123,7 +114,6 @@ const val AUTHORITY_FILEPROVIDER = "at.techbee.jtx.fileprovider"
 
     override fun onResume() {
         super.onResume()
-        AdManager.getInstance()?.resumeAds()
 
         //handle intents, but only if it wasn't already handled
         if(intent.hashCode() != lastProcessedIntentHash) {
@@ -178,12 +168,6 @@ const val AUTHORITY_FILEPROVIDER = "at.techbee.jtx.fileprovider"
         }
     }
 
-    override fun onPause() {
-        super.onPause()
-        AdManager.getInstance()?.pauseAds()
-    }
-
-
     private fun createNotificationChannel() {
         // Create the NotificationChannel, but only on API 26+ because
         // the NotificationChannel class is new and not in the support library
@@ -273,7 +257,6 @@ fun MainNavHost(
                 navController = navController)
         }
         composable(NavigationDrawerDestination.DONATE.name) { DonateScreen(navController) }
-        composable(NavigationDrawerDestination.ADINFO.name) { AdInfoScreen(navController) }
         composable(NavigationDrawerDestination.ABOUT.name) {
             val viewModel: AboutViewModel = viewModel()
             AboutScreen(
@@ -341,7 +324,6 @@ fun MainNavHost(
             }
         )
     }
-
 }
 
 @Preview(showBackground = true)