diff options
author | Torsten Grote <t@grobox.de> | 2020-08-04 09:46:38 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-08-04 09:46:38 -0300 |
commit | 35f7ed512ed7445362d6caee1bf60441f4ce979e (patch) | |
tree | 08fb02c802ff36065dd85fb9dcb95a0adabc03c3 /merchant-terminal/src/main/java/net/taler/merchantpos/config | |
parent | d3a035c59c508b7b0ef3c06a1b0f1f3c0a077bb8 (diff) | |
download | taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.tar.gz taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.tar.bz2 taler-android-35f7ed512ed7445362d6caee1bf60441f4ce979e.zip |
[pos] Implement new refund API (untested since there is no wallet support)
Also do a bit of code cleanup and minor refactorings
This also removes the volley HTTP library which is not needed anymore
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config')
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt (renamed from merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt) | 4 | ||||
-rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt | 59 |
2 files changed, 2 insertions, 61 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt index 77a87fb..daddbff 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantConfigFragment.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigFragment.kt @@ -34,13 +34,13 @@ import kotlinx.android.synthetic.main.fragment_merchant_config.* import net.taler.common.navigate import net.taler.merchantpos.MainViewModel import net.taler.merchantpos.R -import net.taler.merchantpos.config.MerchantConfigFragmentDirections.Companion.actionSettingsToOrder +import net.taler.merchantpos.config.ConfigFragmentDirections.Companion.actionSettingsToOrder import net.taler.merchantpos.topSnackbar /** * Fragment that displays merchant settings. */ -class MerchantConfigFragment : Fragment() { +class ConfigFragment : Fragment() { private val model: MainViewModel by activityViewModels() private val configManager by lazy { model.configManager } diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt deleted file mode 100644 index 5d41196..0000000 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of GNU Taler - * (C) 2020 Taler Systems S.A. - * - * GNU Taler is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free Software - * Foundation; either version 3, or (at your option) any later version. - * - * GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - */ - -package net.taler.merchantpos.config - -import android.net.Uri -import android.util.ArrayMap -import com.android.volley.Response -import com.android.volley.toolbox.JsonObjectRequest -import net.taler.merchantlib.MerchantConfig -import net.taler.merchantpos.LogErrorListener -import org.json.JSONObject - -class MerchantRequest( - method: Int, - private val merchantConfig: MerchantConfig, - endpoint: String, - params: Map<String, String>?, - jsonRequest: JSONObject?, - listener: Response.Listener<JSONObject>, - errorListener: LogErrorListener -) : - JsonObjectRequest( - method, - merchantConfig.legacyUrl(endpoint, params), - jsonRequest, - listener, - errorListener - ) { - - override fun getHeaders(): MutableMap<String, String> { - val headerMap = ArrayMap<String, String>() - headerMap["Authorization"] = "ApiKey " + merchantConfig.apiKey - return headerMap - } - -} - -private fun MerchantConfig.legacyUrl(endpoint: String, params: Map<String, String>?): String { - val uriBuilder = Uri.parse(baseUrl).buildUpon() - uriBuilder.appendPath(endpoint) - params?.forEach { - uriBuilder.appendQueryParameter(it.key, it.value) - } - return uriBuilder.toString() -} |