update PTE again, change AVV Augsburg to new provider

grote · Jan 8, 2024 · 637474c · 637474c
1 parent 8b9a3d5
commit 637474c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -142,7 +142,7 @@ dependencies {
 		exclude module: 'failureaccess'
 		exclude group: 'com.google.j2objc'
 	}
-	implementation('com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7') {
+	implementation('com.gitlab.opentransitmap:public-transport-enabler:c64494b1') {
 		exclude group: 'com.google.guava' // included above
 		exclude group: 'org.json', module: 'json' // provided by Android
 		exclude group: 'net.sf.kxml', module: 'kxml2' // provided by Android

diff --git a/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt b/app/src/main/java/de/grobox/transportr/networks/TransportNetworks.kt
@@ -84,11 +84,11 @@ private val networks = arrayOf(
                         factory = { BayernProvider() }
                     ),
                     TransportNetwork(
-                        id = NetworkId.AVV,
+                        id = NetworkId.AVV_AUGSBURG,
+                        name = R.string.np_name_avv,
                         description = R.string.np_desc_avv,
                         logo = R.drawable.network_avv_logo,
-                        status = BETA,
-                        factory = { AvvProvider() }
+                        factory = { AvvAugsburgProvider("{\"type\":\"AID\",\"aid\":\"jK91AVVZU77xY5oH\"}") }
                     ),
                     TransportNetwork(
                         id = NetworkId.MVV,

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -314,8 +314,9 @@ and always knows where you are to not miss where to get off the bus.
 	<string name="np_desc_tlwm" tools:keep="@string/np_desc_tlwm">Birmingham</string>
 
 	<string name="np_region_germany">Germany</string>
+	<string name="np_name_avv" translatable="false">AVV</string>
 	<string name="np_desc_avv">Augsburg</string>
-	<string name="np_name_avvaachen">AVV</string>
+	<string name="np_name_avvaachen" translatable="false">AVV</string>
 	<string name="np_desc_avvaachen">Aachen</string>
 	<string name="np_name_bayern" translatable="false">BEG</string>
 	<string name="np_desc_bayern">Bavaria, Würzburg, Regensburg</string>

diff --git a/app/witness.gradle b/app/witness.gradle
@@ -85,7 +85,7 @@ dependencyVerification {
         'androidx.viewpager:viewpager:1.0.0:viewpager-1.0.0.aar:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682',
         'com.github.omadahealth:swipy:1.2.3:swipy-1.2.3.aar:63bff6e181742e3e243c29b595062ca65b4274bf7033c65460924f64f65c01e0',
         'com.github.tony19:logback-android:1.1.1-12:logback-android-1.1.1-12.aar:3102228f0e408e3c003b34e96a604e9b9f59d314dcf8f03aa78d9d3648198932',
-        'com.gitlab.opentransitmap:public-transport-enabler:3a16b1e7:public-transport-enabler-3a16b1e7.jar:b7bfd5c19990f019b9c785817ee89fe80329454ea6aeea33ecd0386d227442e5',
+        'com.gitlab.opentransitmap:public-transport-enabler:c64494b1:public-transport-enabler-c64494b1.jar:d707f9556ed29102db596808fc1a18c8b458fd65e5e9d41d046afb1c830571a8',
         'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f',
         'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc',
         'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7',