Skip to content

Commit

Permalink
Remove deprecated methods and associated widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmerlet-at-didomi
pmerlet-at-didomi committed Feb 16, 2024
1 parent 313e571 commit dd716a0
Show file tree
Hide file tree
Showing 24 changed files with 5 additions and 1,315 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ android {

dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation("io.didomi.sdk:android:1.90.0")
implementation("io.didomi.sdk:android:2.0.0")
implementation("androidx.multidex:multidex:2.0.1")
}
303 changes: 0 additions & 303 deletions android/src/main/kotlin/io/didomi/fluttersdk/DidomiPlugin.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,26 +140,10 @@ class DidomiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {

"getUserStatus" -> getUserStatus(result)

"getDisabledPurposeIds" -> getDisabledPurposeIds(result)

"getDisabledVendorIds" -> getDisabledVendorIds(result)

"getEnabledPurposeIds" -> getEnabledPurposeIds(result)

"getEnabledVendorIds" -> getEnabledVendorIds(result)

"getRequiredPurposeIds" -> getRequiredPurposeIds(result)

"getRequiredVendorIds" -> getRequiredVendorIds(result)

"getDisabledPurposes" -> getDisabledPurposes(result)

"getDisabledVendors" -> getDisabledVendors(result)

"getEnabledPurposes" -> getEnabledPurposes(result)

"getEnabledVendors" -> getEnabledVendors(result)

"getRequiredPurposes" -> getRequiredPurposes(result)

"getRequiredVendors" -> getRequiredVendors(result)
Expand All @@ -174,20 +158,6 @@ class DidomiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {

"setUserDisagreeToAll" -> setUserDisagreeToAll(result)

"getUserConsentStatusForPurpose" -> getUserConsentStatusForPurpose(call, result)

"getUserConsentStatusForVendor" -> getUserConsentStatusForVendor(call, result)

"getUserConsentStatusForVendorAndRequiredPurposes" -> getUserConsentStatusForVendorAndRequiredPurposes(call, result)

"getUserLegitimateInterestStatusForPurpose" -> getUserLegitimateInterestStatusForPurpose(call, result)

"getUserLegitimateInterestStatusForVendor" -> getUserLegitimateInterestStatusForVendor(call, result)

"getUserLegitimateInterestStatusForVendorAndRequiredPurposes" -> getUserLegitimateInterestStatusForVendorAndRequiredPurposes(call, result)

"getUserStatusForVendor" -> getUserStatusForVendor(call, result)

"setUserStatus" -> setUserStatus(call, result)

"setUserStatusGlobally" -> setUserStatusGlobally(call, result)
Expand Down Expand Up @@ -375,54 +345,6 @@ class DidomiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
}

/**
* Get the IDs of the disabled purposes
*/
private fun getDisabledPurposeIds(result: Result) {
try {
val idSet = Didomi.getInstance().disabledPurposeIds
result.success(idSet.toList())
} catch (e: DidomiNotReadyException) {
result.error("getDisabledPurposeIds", e.message.orEmpty(), e)
}
}

/**
* Get the IDs of the disabled vendors
*/
private fun getDisabledVendorIds(result: Result) {
try {
val idSet = Didomi.getInstance().disabledVendorIds
result.success(idSet.toList())
} catch (e: DidomiNotReadyException) {
result.error("getDisabledVendorIds", e.message.orEmpty(), e)
}
}

/**
* Get the IDs of the enabled purposes
*/
private fun getEnabledPurposeIds(result: Result) {
try {
val idSet = Didomi.getInstance().enabledPurposeIds
result.success(idSet.toList())
} catch (e: DidomiNotReadyException) {
result.error("getEnabledPurposeIds", e.message.orEmpty(), e)
}
}

/**
* Get the IDs of the enabled vendors
*/
private fun getEnabledVendorIds(result: Result) {
try {
val idSet = Didomi.getInstance().enabledVendorIds
result.success(idSet.toList())
} catch (e: DidomiNotReadyException) {
result.error("getEnabledVendorIds", e.message.orEmpty(), e)
}
}

/**
* Get the IDs of the required purposes
*/
Expand All @@ -447,58 +369,6 @@ class DidomiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
}

/**
* Get disabled purposes
*/
private fun getDisabledPurposes(result: Result) {
try {
val purposes = Didomi.getInstance().disabledPurposes
val list = EntitiesHelper.toList(purposes)
result.success(list)
} catch (e: Exception) {
result.error("getRequiredPurposes", e.message.orEmpty(), e)
}
}

/**
* Get disabled vendors
*/
private fun getDisabledVendors(result: Result) {
try {
val vendors = Didomi.getInstance().disabledVendors
val list = EntitiesHelper.toList(vendors)
result.success(list)
} catch (e: Exception) {
result.error("getDisabledVendors", e.message.orEmpty(), e)
}
}

/**
* Get enabled purposes
*/
private fun getEnabledPurposes(result: Result) {
try {
val purposes = Didomi.getInstance().enabledPurposes
val list = EntitiesHelper.toList(purposes)
result.success(list)
} catch (e: Exception) {
result.error("getEnabledPurposes", e.message.orEmpty(), e)
}
}

/**
* Get enabled vendors
*/
private fun getEnabledVendors(result: Result) {
try {
val vendors = Didomi.getInstance().enabledVendors
val list = EntitiesHelper.toList(vendors)
result.success(list)
} catch (e: Exception) {
result.error("getEnabledVendors", e.message.orEmpty(), e)
}
}

/**
* Get required purposes
*/
Expand Down Expand Up @@ -597,179 +467,6 @@ class DidomiPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
}
}

/**
* Get the user consent status for a specific purpose
* @param purposeId
* @return The user consent status for the specified purpose
*/
private fun getUserConsentStatusForPurpose(call: MethodCall, result: Result) {
val purposeId = call.argument("purposeId") as? String
if (purposeId.isNullOrBlank()) {
result.error("getUserConsentStatusForPurpose", "purposeId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserConsentStatusForPurpose(purposeId)
result.success(
when (status) {
false -> 0
true -> 1
else -> 2
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserConsentStatusForPurpose", e.message.orEmpty(), e)
}
}

/**
* Get the user consent status for a specific vendor
* @param vendorId
* @return The user consent status for the specified vendor
*/
private fun getUserConsentStatusForVendor(call: MethodCall, result: Result) {
val vendorId = call.argument("vendorId") as? String
if (vendorId.isNullOrBlank()) {
result.error("getUserConsentStatusForVendor", "vendorId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserConsentStatusForVendor(vendorId)
result.success(
when (status) {
false -> 0
true -> 1
else -> 2
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserConsentStatusForVendor", e.message.orEmpty(), e)
}
}

/**
* Check if a vendor has consent for all the purposes that it requires
* @param vendorId
* @return The user consent status for all the purposes that it requires for the specified vendor
*/
private fun getUserConsentStatusForVendorAndRequiredPurposes(call: MethodCall, result: Result) {
val vendorId = call.argument("vendorId") as? String
if (vendorId.isNullOrBlank()) {
result.error("getUserConsentStatusForVendorAndRequiredPurposes", "vendorId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserConsentStatusForVendorAndRequiredPurposes(vendorId)
result.success(
when (status) {
false -> 0
true -> 1
else -> 2
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserConsentStatusForVendorAndRequiredPurposes", e.message.orEmpty(), e)
}
}

/**
* Get the user legitimate interest status for a specific purpose
* @param purposeId
* @return The user legitimate interest status for the specified purpose
*/
private fun getUserLegitimateInterestStatusForPurpose(call: MethodCall, result: Result) {
val purposeId = call.argument("purposeId") as? String
if (purposeId.isNullOrBlank()) {
result.error("getUserLegitimateInterestStatusForPurpose", "purposeId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserLegitimateInterestStatusForPurpose(purposeId)
result.success(
when (status) {
false -> 0
true -> 1
else -> 2
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserLegitimateInterestStatusForPurpose", e.message.orEmpty(), e)
}
}

/**
* Get the user legitimate interest status for a specific vendor
* @param vendorId
* @return The user legitimate interest status for the specified vendor
*/
private fun getUserLegitimateInterestStatusForVendor(call: MethodCall, result: Result) {
val vendorId = call.argument("vendorId") as? String
if (vendorId.isNullOrBlank()) {
result.error("getUserLegitimateInterestStatusForVendor", "vendorId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserLegitimateInterestStatusForVendor(vendorId)
result.success(
when (status) {
false -> 0
true -> 1
else -> 2
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserLegitimateInterestStatusForVendor", e.message.orEmpty(), e)
}
}

/**
* Check if a vendor has legitimate interest for all the purposes that it requires
* @param vendorId
* @return The user legitimate interest status for all the purposes that it requires for the specified vendor
*/
private fun getUserLegitimateInterestStatusForVendorAndRequiredPurposes(call: MethodCall, result: Result) {
val vendorId = call.argument("vendorId") as? String
if (vendorId.isNullOrBlank()) {
result.error("getUserLegitimateInterestStatusForVendorAndRequiredPurposes", "vendorId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserLegitimateInterestStatusForVendorAndRequiredPurposes(vendorId)
result.success(
when (status) {
false -> 0
true -> 1
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserLegitimateInterestStatusForVendorAndRequiredPurposes", e.message.orEmpty(), e)
}
}

/**
* Get the user consent and legitimate interest status for a specific vendor
* @param vendorId
* @return The user consent and legitimate interest status for the specified vendor
*/
private fun getUserStatusForVendor(call: MethodCall, result: Result) {
val vendorId = call.argument("vendorId") as? String
if (vendorId.isNullOrBlank()) {
result.error("getUserStatusForVendor", "vendorId is null or blank", null)
return
}
try {
val status = Didomi.getInstance().getUserStatusForVendor(vendorId)
result.success(
when (status) {
false -> 0
true -> 1
}
)
} catch (e: DidomiNotReadyException) {
result.error("getUserStatusForVendor", e.message.orEmpty(), e)
}
}

/**
* Set the user status globally
* @return true if user consent status was updated, false otherwise.
Expand Down
4 changes: 2 additions & 2 deletions example/ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Didomi-XCFramework (1.99.0)
- Didomi-XCFramework (2.0.0)
- didomi_sdk (1.21.0):
- Didomi-XCFramework (= 1.99.0)
- Didomi-XCFramework (= 2.0.0)
- Flutter
- Flutter (1.0.0)
- integration_test (0.0.1):
Expand Down
8 changes: 0 additions & 8 deletions example/lib/testapps/sample_for_purpose_tests.dart
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import 'package:didomi_sdk_example/widgets/get_disabled_purpose_ids.dart';
import 'package:didomi_sdk_example/widgets/get_enabled_purpose_ids.dart';
import 'package:didomi_sdk_example/widgets/get_purpose.dart';
import 'package:didomi_sdk_example/widgets/get_required_purpose_ids.dart';
import 'package:didomi_sdk_example/widgets/get_disabled_purposes.dart';
import 'package:didomi_sdk_example/widgets/get_enabled_purposes.dart';
import 'package:didomi_sdk_example/widgets/get_required_purposes.dart';
import 'package:didomi_sdk_example/widgets/initialize_small.dart';
import 'package:didomi_sdk_example/widgets/set_user_agree_to_all.dart';
Expand Down Expand Up @@ -31,11 +27,7 @@ class HomePage extends StatelessWidget {
SetUserAgreeToAll(),
SetUserDisagreeToAll(),
// Purposes
GetDisabledPurposeIds(),
GetEnabledPurposeIds(),
GetRequiredPurposeIds(),
GetDisabledPurposes(),
GetEnabledPurposes(),
GetRequiredPurposes(),
GetPurpose()
],
Expand Down
Loading

0 comments on commit dd716a0

Please sign in to comment.