aboutsummaryrefslogtreecommitdiff
path: root/taler-kotlin-android
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2022-06-01 13:31:38 +0200
committerFlorian Dold <florian@dold.me>2022-06-01 13:31:38 +0200
commita229b33997842a66295aa4d8dfb5dab6d2f769df (patch)
tree72031a742800ceaae337f04377fb052c91cc2068 /taler-kotlin-android
parent1ef7ae77475f5dd99401a992a92f6c622b29c0a6 (diff)
downloadtaler-android-a229b33997842a66295aa4d8dfb5dab6d2f769df.tar.gz
taler-android-a229b33997842a66295aa4d8dfb5dab6d2f769df.tar.bz2
taler-android-a229b33997842a66295aa4d8dfb5dab6d2f769df.zip
use new annotation for polymorphic serialization
Diffstat (limited to 'taler-kotlin-android')
-rw-r--r--taler-kotlin-android/build.gradle8
-rw-r--r--taler-kotlin-android/src/main/AndroidManifest.xml4
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt11
-rw-r--r--taler-kotlin-android/src/main/java/net/taler/lib/android/Serialization.kt21
4 files changed, 1 insertions, 43 deletions
diff --git a/taler-kotlin-android/build.gradle b/taler-kotlin-android/build.gradle
index b4590c4..5fdb545 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -22,7 +22,6 @@ plugins {
android {
compileSdkVersion 32
- //noinspection GradleDependency
buildToolsVersion "$build_tools_version"
defaultConfig {
@@ -72,13 +71,6 @@ dependencies {
// QR codes
implementation 'com.google.zxing:core:3.5.0' // needs minSdkVersion 24+ or desugar
- // Logcat viewer
- implementation('com.github.pedrovgs:lynx:1.6') {
- exclude group: 'com.android.support'
- exclude group: 'com.squareup'
- }
- implementation 'com.github.pedrovgs:renderers:4.1.0'
-
// JSON parsing and serialization
api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
diff --git a/taler-kotlin-android/src/main/AndroidManifest.xml b/taler-kotlin-android/src/main/AndroidManifest.xml
index f475748..5533913 100644
--- a/taler-kotlin-android/src/main/AndroidManifest.xml
+++ b/taler-kotlin-android/src/main/AndroidManifest.xml
@@ -15,9 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools">
+ package="net.taler.common">
- <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
</manifest>
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
index d86e744..5b57320 100644
--- a/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
+++ b/taler-kotlin-android/src/main/java/net/taler/common/AndroidUtils.kt
@@ -46,8 +46,6 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.navigation.NavDirections
import androidx.navigation.fragment.findNavController
-import com.github.pedrovgs.lynx.LynxActivity
-import com.github.pedrovgs.lynx.LynxConfig
import net.taler.lib.android.ErrorBottomSheet
fun View.fadeIn(endAction: () -> Unit = {}) {
@@ -95,15 +93,6 @@ fun Context.isOnline(): Boolean {
}
}
-fun Context.showLogViewer(logFilter: String? = null) {
- val lynxActivityIntent = LynxActivity.getIntent(this, LynxConfig().apply {
- maxNumberOfTracesToShow = 1500 // higher numbers seem to break share functionality
- samplingRate = Int.MAX_VALUE // no updates please
- logFilter?.let { filter = it }
- })
- startActivity(lynxActivityIntent)
-}
-
fun FragmentActivity.showError(mainText: String, detailText: String = "") = ErrorBottomSheet
.newInstance(mainText, detailText)
.show(supportFragmentManager, "ERROR_BOTTOM_SHEET")
diff --git a/taler-kotlin-android/src/main/java/net/taler/lib/android/Serialization.kt b/taler-kotlin-android/src/main/java/net/taler/lib/android/Serialization.kt
deleted file mode 100644
index 7eb4480..0000000
--- a/taler-kotlin-android/src/main/java/net/taler/lib/android/Serialization.kt
+++ /dev/null
@@ -1,21 +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.lib.android
-
-interface CustomClassDiscriminator {
- val discriminator: String
-}