Skip to content

ALCO-666. Add fun get online check settings from impl database #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KseniyaKs wants to merge 2 commits into
base: ALCO-300
Choose a base branch
from
Open

ALCO-666. Add fun get online check settings from impl database #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1abc945
ALCO-666. Add fun get online check settings from impl database
Jul 31, 2024
9bc7b74
ALCO-666. Fix fun return type
Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
minSdkVersion 22
targetSdkVersion 29
versionCode 800
versionName "0.0.8"
versionName "0.0.8-ALCO-666-1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
26 changes: 19 additions & 7 deletions api/src/main/java/ru/evotor/egais/api/provider/settings/SettingsContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ internal object SettingsContract {
const val CLOUD_SYNCHRONIZATION_COLUMN_NAME = "CLOUD_SYNCHRONIZATION"
const val BEER_TAPS_ENABLED_COLUMN_NAME = "BEER_TAPS"
const val EXCISE_ALCOHOL_ON_TAP_ENABLED_COLUMN_NAME = "EXCISE_ALCOHOL_ON_TAP"
const val X_API_KEY_COLUMN_NAME = "X_API_KEY"
const val ONLINE_CHECK_ENABLED_COLUMN_NAME = "ONLINE_CHECK_ENABLED"
const val ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_COLUMN_NAME = "CODES_CHECK_SELL_MARK_SETTINGS_ENABLED"
const val ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_COLUMN_NAME = "CODES_CHECK_BIND_KEG_SETTINGS_ENABLED"
const val BEER_TAPS_SETTINGS_CODES_CHECK_ENABLED_COLUMN_NAME = "beerTapsSettingsCodesCheckEnabled"
const val BEER_TAPS_SETTINGS_X_API_KEY_COLUMN_NAME = "beerTapsSettingsXApiKey"
const val BEER_TAPS_SETTINGS_INN_FROM_BEER_TAPS_COLUMN_NAME = "beerTapsSettingsInnFromBeerTaps"
Expand All @@ -25,19 +29,27 @@ internal object SettingsContract {
private const val CLOUD_SYNCHRONIZATION_PATH = "CloudSynchronization"
private const val BEER_TAPS_ENABLED_PATH = "BeerTapsEnabled"
private const val EXCISE_ALCOHOL_ON_TAP_ENABLED_PATH = "ExciseAlcoholOnTapEnabled"
private const val CODES_CHECK_ENABLED_PATH= "CodesCheckEnabled"
private const val CODES_CHECK_ENABLED_PATH = "CodesCheckEnabled"
private const val ONLINE_CHECK_ENABLED_PATH = "OnlineCheckEnabled"
private const val ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_PATH = "OnlineCheckSellMarkEnabled"
private const val ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_PATH = "OnlineCheckBindKegEnabled"
private const val X_API_KEY_PATH = "XApiKey"
private const val INN_FROM_BEER_TAPS_PATH = "InnFromBeerTaps"

private val BASE_URI: Uri = Uri.parse("content://$AUTHORITY")
private val BASE_URI_FROM_EGAIS_UI: Uri = Uri.parse("content://$AUTHORITY_EGAIS_UI")
val ALCOHOL_CONTROL_TYPE_URI: Uri = Uri.withAppendedPath(BASE_URI, ALCOHOL_CONTROL_TYPE_PATH)
val ALCOHOL_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, ALCOHOL_ENABLED_PATH)
val LINK_EGAIS_COMMODITY_URI: Uri = Uri.withAppendedPath(BASE_URI, LINK_EGAIS_COMMODITY_PATH)
val UTM_SYNCHRONIZATION_URI: Uri = Uri.withAppendedPath(BASE_URI, UTM_SYNCHRONIZATION_PATH)
val CLOUD_SYNCHRONIZATION_URI: Uri = Uri.withAppendedPath(BASE_URI, CLOUD_SYNCHRONIZATION_PATH)
val BEER_TAPS_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, BEER_TAPS_ENABLED_PATH)
val EXCISE_ALCOHOL_ON_TAP_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, EXCISE_ALCOHOL_ON_TAP_ENABLED_PATH)
val ALCOHOL_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, ALCOHOL_ENABLED_PATH)
val LINK_EGAIS_COMMODITY_URI: Uri = Uri.withAppendedPath(BASE_URI, LINK_EGAIS_COMMODITY_PATH)
val UTM_SYNCHRONIZATION_URI: Uri = Uri.withAppendedPath(BASE_URI, UTM_SYNCHRONIZATION_PATH)
val CLOUD_SYNCHRONIZATION_URI: Uri = Uri.withAppendedPath(BASE_URI, CLOUD_SYNCHRONIZATION_PATH)
val BEER_TAPS_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, BEER_TAPS_ENABLED_PATH)
val EXCISE_ALCOHOL_ON_TAP_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI, EXCISE_ALCOHOL_ON_TAP_ENABLED_PATH)
val ONLINE_CHECK_ENABLED_FROM_IMPL_URI: Uri = Uri.withAppendedPath(BASE_URI, ONLINE_CHECK_ENABLED_PATH)
val ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_FROM_IMPL_URI: Uri = Uri.withAppendedPath(BASE_URI, ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_PATH)
val ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_FROM_IMPL_URI: Uri = Uri.withAppendedPath(BASE_URI, ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_PATH)
val X_API_KEY_FROM_IMPL_URI: Uri = Uri.withAppendedPath(BASE_URI, X_API_KEY_PATH)

val CODES_CHECK_ENABLED_URI: Uri = Uri.withAppendedPath(BASE_URI_FROM_EGAIS_UI, CODES_CHECK_ENABLED_PATH)
val X_API_KEY_URI: Uri = Uri.withAppendedPath(BASE_URI_FROM_EGAIS_UI, X_API_KEY_PATH)
val INN_FROM_BEER_TAPS_URI: Uri = Uri.withAppendedPath(BASE_URI_FROM_EGAIS_UI, INN_FROM_BEER_TAPS_PATH)
Expand Down
59 changes: 59 additions & 0 deletions api/src/main/java/ru/evotor/egais/api/query/settings/SettingsQuery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,63 @@ class SettingsQuery {
cursor.getString(cursor.getColumnIndex(SettingsContract.BEER_TAPS_SETTINGS_INN_FROM_BEER_TAPS_COLUMN_NAME))
}
}

fun getXApiKeyFromImpl(context: Context): String? {
return context.contentResolver.query(
SettingsContract.X_API_KEY_FROM_IMPL_URI,
null,
null,
null,
null
)
?.use { cursor ->
cursor.moveToFirst()
cursor.getString(cursor.getColumnIndex(SettingsContract.X_API_KEY_COLUMN_NAME))
}
}

fun isOnlineCheckEnabled(context: Context): Boolean {
return context.contentResolver.query(
SettingsContract.ONLINE_CHECK_ENABLED_FROM_IMPL_URI,
null,
null,
null,
null
)
?.use { cursor ->
cursor.moveToFirst()
cursor.getString(cursor.getColumnIndex(SettingsContract.ONLINE_CHECK_ENABLED_COLUMN_NAME))
?.toBoolean()
} ?: false
}

fun isOnlineCheckSellMarkEnabled(context: Context): Boolean {
return context.contentResolver.query(
SettingsContract.ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_FROM_IMPL_URI,
null,
null,
null,
null
)
?.use { cursor ->
cursor.moveToFirst()
cursor.getString(cursor.getColumnIndex(SettingsContract.ONLINE_CHECK_SELL_MARK_SETTINGS_ENABLED_COLUMN_NAME))
?.toBoolean()
} ?: false
}

fun isOnlineCheckBindKegEnabled(context: Context): Boolean {
return context.contentResolver.query(
SettingsContract.ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_FROM_IMPL_URI,
null,
null,
null,
null
)
?.use { cursor ->
cursor.moveToFirst()
cursor.getString(cursor.getColumnIndex(SettingsContract.ONLINE_CHECK_BIND_KEG_SETTINGS_ENABLED_COLUMN_NAME))
?.toBoolean()
} ?: false
}
}