/usr/bin/diffoscope --max-report-size 12345678 --max-diff-block-lines 128 --html unsigned/de.dennisguse.opentracks_5141.apk.diffoscope.html --text unsigned/de.dennisguse.opentracks_5141.apk.diffoscope.txt /home/fdroid/fdroiddata/tmp/de.dennisguse.opentracks_5141.apk /home/fdroid/fdroiddata/tmp/sigcp_de.dennisguse.opentracks

⊟

61.2 MB

/home/fdroid/fdroiddata/tmp/de.dennisguse.opentracks_5141.apk vs.

/home/fdroid/fdroiddata/tmp/sigcp_de.dennisguse.opentracks_5141.apk ¶

⊟

13.5 KB

/usr/lib/android-sdk/build-tools/debian/apksigner verify --verbose --print-certs {} ¶

error from `/usr/lib/android-sdk/build-tools/debian/apksigner verify --verbose --print-certs {}` (b): DOES NOT VERIFY ERROR: APK Signature Scheme v3 signer #1: APK integrity check failed. CHUNKED_SHA256 digest mismatch. Expected: <b1180c166d285dd1f76cf68d9ca340e4532db89869ad9f3b5022c4487976dea7>, actual: <8bd72d3b2fa46649cb3469025a9240d39e34ad99436cd335c13c15e2f253bf1a> ERROR: APK Signature Scheme v3 signer #1: APK integrity check failed. VERITY_CHUNKED_SHA256 digest mismatch. Expected: <70476d4bd37f2fb90ed15b6268f979e23339299e6cc6ae4c0a717cbe1e7393ae6bc1660100000000>, actual: <3a5ac869cad90992beee23ec7fab2fe2a80aaa54cda31c31e4a64ec893ed9e286bc1660100000000>

⊟

1.87 KB

zipinfo {} ¶

⊟

61.1 MB

classes.dex ¶

⊟

61.1 MB

dexdump -a -d -f -h {} ¶

Ignoring differences in offsets to keep diff size reasonable.

⊟

15.3 KB

classes.jar ¶

⊟

9.45 KB

zipinfo {} ¶

⊟

1000 B

de/dennisguse/opentracks/data/TrackPointIterator.class ¶

⊟

893 B

procyon -ec {} ¶

⊟

1.35 KB

de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.class ¶

⊟

1.21 KB

procyon -ec {} ¶

⊟

1.95 KB

de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.class ¶

⊟

1.82 KB

procyon -ec {} ¶

⊟

1.59 KB

de/dennisguse/opentracks/ui/markers/MarkerListActivity.class ¶

⊟

1.47 KB

procyon -ec {} ¶

⊟

3.37 KB

smali/de/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel.smali ¶

⊟

2.39 KB

smali/de/dennisguse/opentracks/ui/markers/MarkerListActivity.smali ¶

⊟

1.39 KB

smali/de/dennisguse/opentracks/data/TrackPointIterator.smali ¶

⊟

1.54 KB

smali/de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.smali ¶

⊟

14.5 KB

assets/dexopt/baseline.prof ¶

+Verifies
+Verified·using·v1·scheme·(JAR·signing):·true
+Verified·using·v2·scheme·(APK·Signature·Scheme·v2):·true
+Verified·using·v3·scheme·(APK·Signature·Scheme·v3):·true
+Verified·using·v4·scheme·(APK·Signature·Scheme·v4):·false
+Verified·for·SourceStamp:·false
+Number·of·signers:·1
+Signer·#1·certificate·DN:·CN=FDroid,·OU=FDroid,·O=fdroid.org,·L=ORG,·ST=ORG,·C=UK
+Signer·#1·certificate·SHA-256·digest:·4774e9917ce05a2071b5c339e8e6faa801bfc91b9dccc4804558cf8ae6555c74
+Signer·#1·certificate·SHA-1·digest:·9fe702e83ea3e55ee11508ab10d4fa6c8302069a
+Signer·#1·certificate·MD5·digest:·b44948c92667fead1d53996e5019e755
+Signer·#1·key·algorithm:·RSA
+Signer·#1·key·size·(bits):·2048
+Signer·#1·public·key·SHA-256·digest:·fec9a103e83edddb7d356c19de96b9310a14798cf4189f1320619d791cc1f1e6
+Signer·#1·public·key·SHA-1·digest:·e1c696ef5aea60c705a4017e9f7ec11bb8fd47c6
+Signer·#1·public·key·MD5·digest:·d6952478f2c703f74ffbc2455b72424c
+WARNING:·META-INF/com/android/build/gradle/app-metadata.properties·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.activity_activity-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.activity_activity.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.annotation_annotation-experimental.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.appcompat_appcompat-resources.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.appcompat_appcompat.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.arch.core_core-runtime.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.asynclayoutinflater_asynclayoutinflater.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.cardview_cardview.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.coordinatorlayout_coordinatorlayout.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.core_core-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.core_core-splashscreen.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.core_core.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.cursoradapter_cursoradapter.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.customview_customview.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.databinding_viewbinding.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.documentfile_documentfile.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.drawerlayout_drawerlayout.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.dynamicanimation_dynamicanimation.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.emoji2_emoji2-views-helper.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.emoji2_emoji2.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.fragment_fragment-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.fragment_fragment.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.gridlayout_gridlayout.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.interpolator_interpolator.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.legacy_legacy-support-core-ui.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.legacy_legacy-support-core-utils.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-livedata-core-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-livedata-core.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-livedata.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-process.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-runtime-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-runtime.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-viewmodel-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-viewmodel-savedstate.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.lifecycle_lifecycle-viewmodel.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.loader_loader.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.localbroadcastmanager_localbroadcastmanager.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.preference_preference.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.print_print.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.recyclerview_recyclerview.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.savedstate_savedstate-ktx.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.savedstate_savedstate.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.slidingpanelayout_slidingpanelayout.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.startup_startup-runtime.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.swiperefreshlayout_swiperefreshlayout.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.tracing_tracing.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.transition_transition.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.vectordrawable_vectordrawable-animated.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.vectordrawable_vectordrawable.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.versionedparcelable_versionedparcelable.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.viewpager2_viewpager2.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.viewpager_viewpager.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/androidx.window_window.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/com.google.android.material_material.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/kotlinx_coroutines_android.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/kotlinx_coroutines_core.version·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.
+WARNING:·META-INF/services/kotlinx.coroutines.internal.MainDispatcherFactory·not·protected·by·signature.·Unauthorized·modifications·to·this·JAR·entry·will·not·be·detected.·Delete·or·move·the·entry·outside·of·META-INF/.


Offset 1, 13 lines modified		Offset 1, 13 lines modified
1	DEX·version·'035'	1	DEX·version·'035'
2	DEX·file·header:	2	DEX·file·header:
3	magic···············:·'dex\n035\0'	3	magic···············:·'dex\n035\0'
4	checksum············:·~~1d7801dc~~	4	checksum············:·225abbfa
5	signature···········:·~~6002~~...~~e069~~	5	signature···········:·dc36...b9cb
6	file_size···········:·9464512	6	file_size···········:·9464492
7	header_size·········:·112	7	header_size·········:·112
8	link_size···········:·0	8	link_size···········:·0
9	link_off············:·0·(0x000000)	9	link_off············:·0·(0x000000)
10	string_ids_size·····:·65886	10	string_ids_size·····:·65886
11	string_ids_off······:·112·(0x000070)	11	string_ids_off······:·112·(0x000070)
12	type_ids_size·······:·8634	12	type_ids_size·······:·8634
13	type_ids_off········:·263656·(0x0405e8)	13	type_ids_off········:·263656·(0x0405e8)
Offset 15, 15 lines modified		Offset 15, 15 lines modified
15	proto_ids_off·······:·298192·(0x048cd0)	15	proto_ids_off·······:·298192·(0x048cd0)
16	field_ids_size······:·46439	16	field_ids_size······:·46439
17	field_ids_off·······:·461548·(0x070aec)	17	field_ids_off·······:·461548·(0x070aec)
18	method_ids_size·····:·64691	18	method_ids_size·····:·64691
19	method_ids_off······:·833060·(0x0cb624)	19	method_ids_off······:·833060·(0x0cb624)
20	class_defs_size·····:·7219	20	class_defs_size·····:·7219
21	class_defs_off······:·1350588·(0x149bbc)	21	class_defs_off······:·1350588·(0x149bbc)
22	data_size···········:·7882916	22	data_size···········:·7882896
23	data_off············:·1581596·(0x18221c)	23	data_off············:·1581596·(0x18221c)

24	Class·#0·header:	24	Class·#0·header:
25	class_idx···········:·395	25	class_idx···········:·395
26	access_flags········:·1·(0x0001)	26	access_flags········:·1·(0x0001)
27	superclass_idx······:·6313	27	superclass_idx······:·6313
28	source_file_idx·····:·12648	28	source_file_idx·····:·12648
Offset 888013, 39 lines modified		Offset 888013, 38 lines modified
888013	······name··········:·'<init>'	888013	······name··········:·'<init>'
888014	······type··········:·'(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V'	888014	······type··········:·'(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V'
888015	······access········:·0x10001·(PUBLIC·CONSTRUCTOR)	888015	······access········:·0x10001·(PUBLIC·CONSTRUCTOR)
888016	······code··········-	888016	······code··········-
888017	······registers·····:·4	888017	······registers·····:·4
888018	······ins···········:·4	888018	······ins···········:·4
888019	······outs··········:·2	888019	······outs··········:·2
888020	······insns·size····:·23·16-bit·code·units	888020	······insns·size····:·21·16-bit·code·units
888021	3d22dc:········································\|[3d22dc]·de.dennisguse.opentracks.data.TrackPointIterator.<init>:(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V	888021	3d22dc:········································\|[3d22dc]·de.dennisguse.opentracks.data.TrackPointIterator.<init>:(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V
888022	3d22ec:·7010·e4bc·0000·························\|0000:·invoke-direct·{v0},·Ljava/lang/Object;.<init>:()V·//·method@bce4	888022	3d22ec:·7010·e4bc·0000·························\|0000:·invoke-direct·{v0},·Ljava/lang/Object;.<init>:()V·//·method@bce4
888023	3d22f2:·5b01·dea2······························\|0003:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.contentProviderUtils:Lde/dennisguse/opentracks/data/ContentProviderUtils;·//·field@a2de	888023	3d22f2:·5b01·dea2······························\|0003:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.contentProviderUtils:Lde/dennisguse/opentracks/data/ContentProviderUtils;·//·field@a2de
888024	3d22f6:·5b02·e1a2······························\|0005:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.trackId:Lde/dennisguse/opentracks/data/models/Track$Id;·//·field@a2e1	888024	3d22f6:·5b02·e1a2······························\|0005:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.trackId:Lde/dennisguse/opentracks/data/models/Track$Id;·//·field@a2e1
888025	3d22fa:·7020·96ad·3000·························\|0007:·invoke-direct·{v0,·v3},·Lde/dennisguse/opentracks/data/TrackPointIterator;.getCursor:(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;·//·method@ad96	888025	3d22fa:·7020·96ad·3000·························\|0007:·invoke-direct·{v0,·v3},·Lde/dennisguse/opentracks/data/TrackPointIterator;.getCursor:(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;·//·method@ad96
888026	3d2300:·0c01···································\|000a:·move-result-object·v1	888026	3d2300:·0c01···································\|000a:·move-result-object·v1
888027	3d2302:·5b01·dfa2······························\|000b:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df	888027	3d2302:·5b01·dfa2······························\|000b:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df
888028	3d2306:·2201·dc15······························\|000d:·new-instance·v1,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·type@15dc	888028	3d2306:·2202·dc15······························\|000d:·new-instance·v2,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·type@15dc
888029	3d230a:·5402·dfa2······························\|000f:·iget-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df
888030	3d230e:·7020·cfac·2100·························\|0011:·invoke-direct·{v1,·v2},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;.<init>:(Landroid/database/Cursor;)V·//·method@accf	888029	3d230a:·7020·cfac·1200·························\|000f:·invoke-direct·{v2,·v1},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;.<init>:(Landroid/database/Cursor;)V·//·method@accf
888031	3d2314:·5b01·e0a2······························\|0014:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·field@a2e0	888030	3d2310:·5b02·e0a2······························\|0012:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·field@a2e0
888032	3d2318:·0e00···································\|0016:·return-void	888031	3d2314:·0e00···································\|0014:·return-void
888033	······catches·······:·(none)	888032	······catches·······:·(none)
888034	······positions·····:·	888033	······positions·····:·
888035	········0x0000·line=26	888034	········0x0000·line=26
888036	········0x0003·line=27	888035	········0x0003·line=27
888037	········0x0005·line=28	888036	········0x0005·line=28
888038	········0x0007·line=30	888037	········0x0007·line=30
888039	········0x000d·line=31	888038	········0x000d·line=31
888040	······locals········:·	888039	······locals········:·
888041	········0x0000·-·0x0017·reg=0·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888040	········0x0000·-·0x0015·reg=0·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·
888042	········0x0000·-·0x0017·reg=1·(null)·Lde/dennisguse/opentracks/data/ContentProviderUtils;·	888041	········0x0000·-·0x0015·reg=1·(null)·Lde/dennisguse/opentracks/data/ContentProviderUtils;·
888043	········0x0000·-·0x0017·reg=2·(null)·Lde/dennisguse/opentracks/data/models/Track$Id;·	888042	········0x0000·-·0x0015·reg=2·(null)·Lde/dennisguse/opentracks/data/models/Track$Id;·
888044	········0x0000·-·0x0017·reg=3·(null)·Lde/dennisguse/opentracks/data/models/TrackPoint$Id;·	888043	········0x0000·-·0x0015·reg=3·(null)·Lde/dennisguse/opentracks/data/models/TrackPoint$Id;·

888045	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)	888044	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)
888046	······name··········:·'getCursor'	888045	······name··········:·'getCursor'
888047	······type··········:·'(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;'	888046	······type··········:·'(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;'
888048	······access········:·0x0002·(PRIVATE)	888047	······access········:·0x0002·(PRIVATE)
888049	······code··········-	888048	······code··········-
888050	······registers·····:·4	888049	······registers·····:·4
Offset 888071, 21 lines modified		Offset 888070, 21 lines modified
888071	······type··········:·'()V'	888070	······type··········:·'()V'
888072	······access········:·0x0001·(PUBLIC)	888071	······access········:·0x0001·(PUBLIC)
888073	······code··········-	888072	······code··········-
888074	······registers·····:·2	888073	······registers·····:·2
888075	······ins···········:·1	888074	······ins···········:·1
888076	······outs··········:·1	888075	······outs··········:·1
888077	······insns·size····:·11·16-bit·code·units	888076	······insns·size····:·11·16-bit·code·units
888078	3d231c:········································\|[3d231c]·de.dennisguse.opentracks.data.TrackPointIterator.close:()V	888077	3d2318:········································\|[3d2318]·de.dennisguse.opentracks.data.TrackPointIterator.close:()V
888079	3d232c:·5410·dfa2······························\|0000:·iget-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df	888078	3d2328:·5410·dfa2······························\|0000:·iget-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df
888080	3d2330:·3800·0800······························\|0002:·if-eqz·v0,·000a·//·+0008	888079	3d232c:·3800·0800······························\|0002:·if-eqz·v0,·000a·//·+0008
888081	3d2334:·7210·4304·0000·························\|0004:·invoke-interface·{v0},·Landroid/database/Cursor;.close:()V·//·method@0443	888080	3d2330:·7210·4304·0000·························\|0004:·invoke-interface·{v0},·Landroid/database/Cursor;.close:()V·//·method@0443
888082	3d233a:·1200···································\|0007:·const/4·v0,·#int·0·//·#0	888081	3d2336:·1200···································\|0007:·const/4·v0,·#int·0·//·#0
888083	3d233c:·5b10·dfa2······························\|0008:·iput-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df	888082	3d2338:·5b10·dfa2······························\|0008:·iput-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2df
888084	3d2340:·0e00···································\|000a:·return-void	888083	3d233c:·0e00···································\|000a:·return-void
888085	······catches·······:·(none)	888084	······catches·······:·(none)
888086	······positions·····:·	888085	······positions·····:·
888087	········0x0000·line=62	888086	········0x0000·line=62
888088	········0x0004·line=63	888087	········0x0004·line=63
888089	········0x0008·line=64	888088	········0x0008·line=64
888090	······locals········:·	888089	······locals········:·
888091	········0x0000·-·0x000b·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888090	········0x0000·-·0x000b·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·
Offset 888095, 17 lines modified		Offset 888094, 17 lines modified
888095	······type··········:·'(Ljava/util/function/Consumer;)V'	888094	······type··········:·'(Ljava/util/function/Consumer;)V'
888096	······access········:·0x1001·(PUBLIC·SYNTHETIC)	888095	······access········:·0x1001·(PUBLIC·SYNTHETIC)
888097	······code··········-	888096	······code··········-
888098	······registers·····:·2	888097	······registers·····:·2
888099	······ins···········:·2	888098	······ins···········:·2
888100	······outs··········:·2	888099	······outs··········:·2
888101	······insns·size····:·4·16-bit·code·units	888100	······insns·size····:·4·16-bit·code·units
888102	3d2344:········································\|[3d2344]·de.dennisguse.opentracks.data.TrackPointIterator.forEachRemaining:(Ljava/util/function/Consumer;)V	888101	3d2340:········································\|[3d2340]·de.dennisguse.opentracks.data.TrackPointIterator.forEachRemaining:(Ljava/util/function/Consumer;)V
888103	3d2354:·7120·f0ba·1000·························\|0000:·invoke-static·{v0,·v1},·Lj$/util/Iterator$-CC;.$default$forEachRemaining:(Ljava/util/Iterator;Ljava/util/function/Consumer;)V·//·method@baf0	888102	3d2350:·7120·f0ba·1000·························\|0000:·invoke-static·{v0,·v1},·Lj$/util/Iterator$-CC;.$default$forEachRemaining:(Ljava/util/Iterator;Ljava/util/function/Consumer;)V·//·method@baf0
888104	3d235a:·0e00···································\|0003:·return-void	888103	3d2356:·0e00···································\|0003:·return-void
888105	······catches·······:·(none)	888104	······catches·······:·(none)
888106	······positions·····:·	888105	······positions·····:·
888107	······locals········:·	888106	······locals········:·

888108	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)	888107	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)
888109	······name··········:·'getCount'	888108	······name··········:·'getCount'
888110	······type··········:·'()I'	888109	······type··········:·'()I'
Offset 888211, 18 lines modified		Offset 888210, 18 lines modified
888211	······type··········:·'()V'	888210	······type··········:·'()V'
888212	······access········:·0x0001·(PUBLIC)	888211	······access········:·0x0001·(PUBLIC)
888213	······code··········-	888212	······code··········-
888214	······registers·····:·2	888213	······registers·····:·2
888215	······ins···········:·1	888214	······ins···········:·1
888216	······outs··········:·1	888215	······outs··········:·1
888217	······insns·size····:·6·16-bit·code·units	888216	······insns·size····:·6·16-bit·code·units
888218	3d235c:········································\|[3d235c]·de.dennisguse.opentracks.data.TrackPointIterator.remove:()V	888217	3d2358:········································\|[3d2358]·de.dennisguse.opentracks.data.TrackPointIterator.remove:()V
888219	3d236c:·2200·be18······························\|0000:·new-instance·v0,·Ljava/lang/UnsupportedOperationException;·//·type@18be	888218	3d2368:·2200·be18······························\|0000:·new-instance·v0,·Ljava/lang/UnsupportedOperationException;·//·type@18be
888220	3d2370:·7010·98bd·0000·························\|0002:·invoke-direct·{v0},·Ljava/lang/UnsupportedOperationException;.<init>:()V·//·method@bd98	888219	3d236c:·7010·98bd·0000·························\|0002:·invoke-direct·{v0},·Ljava/lang/UnsupportedOperationException;.<init>:()V·//·method@bd98
888221	3d2376:·2700···································\|0005:·throw·v0	888220	3d2372:·2700···································\|0005:·throw·v0
888222	······catches·······:·(none)	888221	······catches·······:·(none)
888223	······positions·····:·	888222	······positions·····:·
888224	········0x0000·line=70	888223	········0x0000·line=70
888225	······locals········:·	888224	······locals········:·
888226	········0x0000·-·0x0006·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888225	········0x0000·-·0x0006·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·

Max diff block lines reached; 64063276/64073502 bytes (99.98%) of diff not shown.


Offset 17, 16 lines modified		Offset 17, 17 lines modified
17	····private·Cursor·cursor;	17	····private·Cursor·cursor;
18	····private·final·CachedTrackPointsIndexes·indexes;	18	····private·final·CachedTrackPointsIndexes·indexes;
19	····private·final·Track$Id·trackId;	19	····private·final·Track$Id·trackId;
20	····	20	····
21	····public·TrackPointIterator(final·ContentProviderUtils·contentProviderUtils,·final·Track$Id·trackId,·final·TrackPoint$Id·trackPoint$Id)·{	21	····public·TrackPointIterator(final·ContentProviderUtils·contentProviderUtils,·final·Track$Id·trackId,·final·TrackPoint$Id·trackPoint$Id)·{
22	········this.contentProviderUtils·=·contentProviderUtils;	22	········this.contentProviderUtils·=·contentProviderUtils;
23	········this.trackId·=·trackId;	23	········this.trackId·=·trackId;
24	········~~thi~~s.cursor·=·this.getCursor(trackPoint$Id);	24	········final·Cursor·cursor·=·this.getCursor(trackPoint$Id);
		25	········this.cursor·=·cursor;
25	········this.indexes·=·new·CachedTrackPointsIndexes(~~this.~~cursor);	26	········this.indexes·=·new·CachedTrackPointsIndexes(cursor);
26	····}	27	····}
27	····	28	····
28	····private·Cursor·getCursor(final·TrackPoint$Id·trackPoint$Id)·{	29	····private·Cursor·getCursor(final·TrackPoint$Id·trackPoint$Id)·{
29	········return·this.contentProviderUtils.getTrackPointCursor(this.trackId,·trackPoint$Id);	30	········return·this.contentProviderUtils.getTrackPointCursor(this.trackId,·trackPoint$Id);
30	····}	31	····}
31	····	32	····
32	····public·void·close()·{	33	····public·void·close()·{


Offset 1, 12 lines modified		Offset 1, 12 lines modified
1	Zip·file·size:·23515499·bytes,·number·of·entries:·1076	1	Zip·file·size:·23515499·bytes,·number·of·entries:·1076
2	-rw-r--r--··0.0·unx·······56·b-·defN·81-Jan-01·01:01·META-INF/com/android/build/gradle/app-metadata.properties	2	-rw-r--r--··0.0·unx·······56·b-·defN·81-Jan-01·01:01·META-INF/com/android/build/gradle/app-metadata.properties
3	-rw-r--r--··0.0·unx·····1712·b-·stor·81-Jan-01·01:01·assets/dexopt/baseline.prof	3	-rw-r--r--··0.0·unx·····1713·b-·stor·81-Jan-01·01:01·assets/dexopt/baseline.prof
4	-rw-r--r--··0.0·unx······186·b-·stor·81-Jan-01·01:01·assets/dexopt/baseline.profm	4	-rw-r--r--··0.0·unx······186·b-·stor·81-Jan-01·01:01·assets/dexopt/baseline.profm
5	-rw-r--r--··0.0·unx··9464512·b-·defN·81-Jan-01·01:01·classes.dex	5	-rw-r--r--··0.0·unx··9464492·b-·defN·81-Jan-01·01:01·classes.dex
6	-rw-r--r--··0.0·unx···587096·b-·defN·81-Jan-01·01:01·classes2.dex	6	-rw-r--r--··0.0·unx···587096·b-·defN·81-Jan-01·01:01·classes2.dex
7	-rw----·····2.4·fat·····1719·b-·defN·81-Jan-01·01:01·DebugProbesKt.bin	7	-rw----·····2.4·fat·····1719·b-·defN·81-Jan-01·01:01·DebugProbesKt.bin
8	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.activity_activity-ktx.version	8	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.activity_activity-ktx.version
9	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.activity_activity.version	9	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.activity_activity.version
10	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.annotation_annotation-experimental.version	10	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.annotation_annotation-experimental.version
11	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.appcompat_appcompat-resources.version	11	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.appcompat_appcompat-resources.version
12	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.appcompat_appcompat.version	12	-rw----·····2.4·fat········6·b-·stor·81-Jan-01·01:01·META-INF/androidx.appcompat_appcompat.version
Offset 1071, 8 lines modified		Offset 1071, 8 lines modified
1071	-rw----·····0.0·fat······592·b-·defN·81-Jan-01·01:01·res/zN.xml	1071	-rw----·····0.0·fat······592·b-·defN·81-Jan-01·01:01·res/zN.xml
1072	-rw----·····0.0·fat······400·b-·defN·81-Jan-01·01:01·res/z_.xml	1072	-rw----·····0.0·fat······400·b-·defN·81-Jan-01·01:01·res/z_.xml
1073	-rw----·····0.0·fat······840·b-·defN·81-Jan-01·01:01·res/zq.xml	1073	-rw----·····0.0·fat······840·b-·defN·81-Jan-01·01:01·res/zq.xml
1074	-rw----·····0.0·fat··2183256·b-·stor·81-Jan-01·01:01·resources.arsc	1074	-rw----·····0.0·fat··2183256·b-·stor·81-Jan-01·01:01·resources.arsc
1075	-rw----·····2.0·fat····97839·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.SF	1075	-rw----·····2.0·fat····97839·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.SF
1076	-rw----·····2.0·fat·····1334·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.RSA	1076	-rw----·····2.0·fat·····1334·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.RSA
1077	-rw----·····2.0·fat····97712·b-·defN·81-Jan-01·01:01·META-INF/MANIFEST.MF	1077	-rw----·····2.0·fat····97712·b-·defN·81-Jan-01·01:01·META-INF/MANIFEST.MF
1078	1076·files,·32207395·bytes·uncompressed,·23386~~219~~·bytes·compressed:··27.4%	1078	1076·files,·32207376·bytes·uncompressed,·23386382·bytes·compressed:··27.4%


Offset 46, 16 lines modified		Offset 46, 17 lines modified
46	········this.audioFocusChangeListener·=·(AudioManager$OnAudioFocusChangeListener)new·VoiceAnnouncement$1(this);	46	········this.audioFocusChangeListener·=·(AudioManager$OnAudioFocusChangeListener)new·VoiceAnnouncement$1(this);
47	········this.utteranceListener·=·(UtteranceProgressListener)new·VoiceAnnouncement$2(this);	47	········this.utteranceListener·=·(UtteranceProgressListener)new·VoiceAnnouncement$2(this);
48	········this.ttsInitStatus·=·-1;	48	········this.ttsInitStatus·=·-1;
49	········this.ttsReady·=·false;	49	········this.ttsReady·=·false;
50	········this.context·=·context;	50	········this.context·=·context;
51	········this.audioManager·=·(AudioManager)context.getSystemService("audio");	51	········this.audioManager·=·(AudioManager)context.getSystemService("audio");
52	········this.contentProviderUtils·=·new·ContentProviderUtils(context);	52	········this.contentProviderUtils·=·new·ContentProviderUtils(context);
		53	········final·Distance·voiceAnnouncementDistance·=·PreferencesUtils.getVoiceAnnouncementDistance();
53	········this.intervalDistance·=·~~PreferencesUtils.get~~VoiceAnnouncementDistance();	54	········this.intervalDistance·=·voiceAnnouncementDistance;
54	········this.intervalStatistics·=·new·IntervalStatistics(thi~~s.i~~nte~~rval~~Distance);	55	········this.intervalStatistics·=·new·IntervalStatistics(voiceAnnouncementDistance);
55	····}	56	····}
56	····	57	····
57	····private·void·onTtsReady()·{	58	····private·void·onTtsReady()·{
58	········Locale·language·=·Locale.getDefault();	59	········Locale·language·=·Locale.getDefault();
59	········final·int·languageAvailable·=·this.tts.isLanguageAvailable(language);	60	········final·int·languageAvailable·=·this.tts.isLanguageAvailable(language);
60	········if·(languageAvailable·==·-1·\|\|·languageAvailable·==·-2)·{	61	········if·(languageAvailable·==·-1·\|\|·languageAvailable·==·-2)·{
61	············Log.w(VoiceAnnouncement.TAG,·"Default·locale·not·available,·use·English.");	62	············Log.w(VoiceAnnouncement.TAG,·"Default·locale·not·available,·use·English.");


Offset 143, 16 lines modified		Offset 143, 17 lines modified
143	········}	143	········}
144	········else·{	144	········else·{
145	············track·=·null;	145	············track·=·null;
146	········}	146	········}
147	········this.track·=·track;	147	········this.track·=·track;
148	········this.viewBinding.markerList.setEmptyView((View)this.viewBinding.markerListEmpty);	148	········this.viewBinding.markerList.setEmptyView((View)this.viewBinding.markerListEmpty);
149	········this.viewBinding.markerList.setOnItemClickListener((AdapterView$OnItemClickListener)new·MarkerListActivity$$ExternalSyntheticLambda2(this));	149	········this.viewBinding.markerList.setOnItemClickListener((AdapterView$OnItemClickListener)new·MarkerListActivity$$ExternalSyntheticLambda2(this));
150	········~~thi~~s.resourceCursorAdapter·=·new·MarkerResourceCursorAdapter((Activity)this,·2131492929);	150	········final·MarkerResourceCursorAdapter·resourceCursorAdapter·=·new·MarkerResourceCursorAdapter((Activity)this,·2131492929);
		151	········this.resourceCursorAdapter·=·resourceCursorAdapter;
151	········this.viewBinding.markerList.setOnScrollListener((AbsListView$OnScrollListener)new·ScrollVisibleViews((ScrollVisibleViews$VisibleViewsListener)~~this.~~resourceCursorAdapter));	152	········this.viewBinding.markerList.setOnScrollListener((AbsListView$OnScrollListener)new·ScrollVisibleViews((ScrollVisibleViews$VisibleViewsListener)resourceCursorAdapter));
152	········this.viewBinding.markerList.setAdapter((ListAdapter)this.resourceCursorAdapter);	153	········this.viewBinding.markerList.setAdapter((ListAdapter)this.resourceCursorAdapter);
153	········ActivityUtils.configureListViewContextualMenu(this.viewBinding.markerList,·this.contextualActionModeCallback);	154	········ActivityUtils.configureListViewContextualMenu(this.viewBinding.markerList,·this.contextualActionModeCallback);
154	········this.trackRecordingServiceConnection·=·new·TrackRecordingServiceConnection(this.bindCallback);	155	········this.trackRecordingServiceConnection·=·new·TrackRecordingServiceConnection(this.bindCallback);
155	········this.setSupportActionBar((Toolbar)this.viewBinding.bottomAppBarLayout.bottomAppBar);	156	········this.setSupportActionBar((Toolbar)this.viewBinding.bottomAppBarLayout.bottomAppBar);
156	····}	157	····}
157	····	158	····
158	····public·boolean·onCreateOptionsMenu(final·Menu·menu)·{	159	····public·boolean·onCreateOptionsMenu(final·Menu·menu)·{


Offset 166, 21 lines modified		Offset 166, 19 lines modified
166	····invoke-virtual·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$IntervalOption;->getDistance(Lde/dennisguse/opentracks/settings/UnitSystem;)Lde/dennisguse/opentracks/data/models/Distance;	166	····invoke-virtual·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$IntervalOption;->getDistance(Lde/dennisguse/opentracks/settings/UnitSystem;)Lde/dennisguse/opentracks/data/models/Distance;

167	····move-result-object·p2	167	····move-result-object·p2

168	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->distanceInterval:Lde/dennisguse/opentracks/data/models/Distance;	168	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->distanceInterval:Lde/dennisguse/opentracks/data/models/Distance;

169	····.line·76	169	····.line·76
170	····new-instance·p2,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	170	····new-instance·p3,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

171	····i~~get~~-~~obj~~ect·p3,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics~~Model~~;->di~~sta~~n~~ceI~~nt~~erva~~l:Lde/dennisguse/opentracks/data/models/Distance;	171	····invoke-direct·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V

172	····invoke-direct·{p2,·p3},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V

173	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	172	····iput-object·p3,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

174	····.line·78	173	····.line·78
175	····invoke-direct·{p0,·p1},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->loadIntervalStatistics(Lde/dennisguse/opentracks/data/models/Track$Id;)V	174	····invoke-direct·{p0,·p1},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->loadIntervalStatistics(Lde/dennisguse/opentracks/data/models/Track$Id;)V

176	····.line·81	175	····.line·81
177	····:cond_1	176	····:cond_1
178	····new-instance·p2,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$1;	177	····new-instance·p2,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$1;
Offset 360, 20 lines modified		Offset 358, 18 lines modified
360	····invoke-virtual·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$IntervalOption;->getDistance(Lde/dennisguse/opentracks/settings/UnitSystem;)Lde/dennisguse/opentracks/data/models/Distance;	358	····invoke-virtual·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel$IntervalOption;->getDistance(Lde/dennisguse/opentracks/settings/UnitSystem;)Lde/dennisguse/opentracks/data/models/Distance;

361	····move-result-object·p2	359	····move-result-object·p2

362	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->distanceInterval:Lde/dennisguse/opentracks/data/models/Distance;	360	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->distanceInterval:Lde/dennisguse/opentracks/data/models/Distance;

363	····.line·115	361	····.line·115
364	····new-instance·p2,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	362	····new-instance·p3,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

365	····iget-object·p3,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->distanceInterval:Lde/dennisguse/opentracks/data/models/Distance;

366	····invoke-direct·{p2,·p3},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V	363	····invoke-direct·{p3,·p2},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V

367	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	364	····iput-object·p3,·p0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

368	····.line·116	365	····.line·116
369	····invoke-direct·{p0,·p1},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->loadIntervalStatistics(Lde/dennisguse/opentracks/data/models/Track$Id;)V	366	····invoke-direct·{p0,·p1},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatisticsModel;->loadIntervalStatistics(Lde/dennisguse/opentracks/data/models/Track$Id;)V

370	····return-void	367	····return-void
371	.end·method	368	.end·method


Offset 549, 26 lines modified		Offset 549, 24 lines modified
549	····const·v0,·0x7f0c0041	549	····const·v0,·0x7f0c0041

550	····invoke-direct·{p1,·p0,·v0},·Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;-><init>(Landroid/app/Activity;I)V	550	····invoke-direct·{p1,·p0,·v0},·Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;-><init>(Landroid/app/Activity;I)V

551	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->resourceCursorAdapter:Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;	551	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->resourceCursorAdapter:Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;

552	····.line·125	552	····.line·125
553	····new-instance·p1,·Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews;	553	····new-instance·v0,·Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews;

554	····iget-object·v0,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->resourceCursorAdapter:Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;

555	····invoke-direct·{p1,·v0},·Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews;-><init>(Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews$VisibleViewsListener;)V	554	····invoke-direct·{v0,·p1},·Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews;-><init>(Lde/dennisguse/opentracks/ui/util/ScrollVisibleViews$VisibleViewsListener;)V

556	····.line·126	555	····.line·126
557	····iget-object·v0,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->viewBinding:Lde/dennisguse/opentracks/databinding/MarkerListBinding;	556	····iget-object·p1,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->viewBinding:Lde/dennisguse/opentracks/databinding/MarkerListBinding;

558	····iget-object·v0,·v0,·Lde/dennisguse/opentracks/databinding/MarkerListBinding;->markerList:Landroid/widget/ListView;	557	····iget-object·p1,·p1,·Lde/dennisguse/opentracks/databinding/MarkerListBinding;->markerList:Landroid/widget/ListView;

559	····invoke-virtual·{v0,·p1},·Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V	558	····invoke-virtual·{p1,·v0},·Landroid/widget/ListView;->setOnScrollListener(Landroid/widget/AbsListView$OnScrollListener;)V

560	····.line·127	559	····.line·127
561	····iget-object·p1,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->viewBinding:Lde/dennisguse/opentracks/databinding/MarkerListBinding;	560	····iget-object·p1,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->viewBinding:Lde/dennisguse/opentracks/databinding/MarkerListBinding;

562	····iget-object·p1,·p1,·Lde/dennisguse/opentracks/databinding/MarkerListBinding;->markerList:Landroid/widget/ListView;	561	····iget-object·p1,·p1,·Lde/dennisguse/opentracks/databinding/MarkerListBinding;->markerList:Landroid/widget/ListView;

563	····iget-object·v0,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->resourceCursorAdapter:Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;	562	····iget-object·v0,·p0,·Lde/dennisguse/opentracks/ui/markers/MarkerListActivity;->resourceCursorAdapter:Lde/dennisguse/opentracks/ui/markers/MarkerResourceCursorAdapter;


Offset 58, 21 lines modified		Offset 58, 19 lines modified
58	····invoke-direct·{p0,·p3},·Lde/dennisguse/opentracks/data/TrackPointIterator;->getCursor(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;	58	····invoke-direct·{p0,·p3},·Lde/dennisguse/opentracks/data/TrackPointIterator;->getCursor(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;

59	····move-result-object·p1	59	····move-result-object·p1

60	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/data/TrackPointIterator;->cursor:Landroid/database/Cursor;	60	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/data/TrackPointIterator;->cursor:Landroid/database/Cursor;

61	····.line·31	61	····.line·31
62	····new-instance·p1,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;	62	····new-instance·p2,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;

63	····i~~get~~-~~obj~~ect·p2,·p0,·Lde/dennisguse/opentracks/data/TrackPoint~~Iterator~~;->~~cursor:~~Landroid/database/Cursor;	63	····invoke-direct·{p2,·p1},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;-><init>(Landroid/database/Cursor;)V

64	····invoke-direct·{p1,·p2},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;-><init>(Landroid/database/Cursor;)V

65	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/data/TrackPointIterator;->indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;	64	····iput-object·p2,·p0,·Lde/dennisguse/opentracks/data/TrackPointIterator;->indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;

66	····return-void	65	····return-void
67	.end·method	66	.end·method

68	.method·private·getCursor(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;	67	.method·private·getCursor(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;
69	····.locals·2	68	····.locals·2


Offset 134, 21 lines modified		Offset 134, 19 lines modified
134	····invoke-static·{},·Lde/dennisguse/opentracks/settings/PreferencesUtils;->getVoiceAnnouncementDistance()Lde/dennisguse/opentracks/data/models/Distance;	134	····invoke-static·{},·Lde/dennisguse/opentracks/settings/PreferencesUtils;->getVoiceAnnouncementDistance()Lde/dennisguse/opentracks/data/models/Distance;

135	····move-result-object·p1	135	····move-result-object·p1

136	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/services/announcement/VoiceAnnouncement;->intervalDistance:Lde/dennisguse/opentracks/data/models/Distance;	136	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/services/announcement/VoiceAnnouncement;->intervalDistance:Lde/dennisguse/opentracks/data/models/Distance;

137	····.line·125	137	····.line·125
138	····new-instance·p1,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	138	····new-instance·v0,·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

139	····i~~get~~-~~obj~~ect·v0,·p0,·Lde/dennisguse/opentracks/~~servic~~es/a~~nnou~~ncement~~/VoiceAnnoun~~c~~emen~~t;->in~~tervalD~~ist~~anc~~e:Lde/dennisguse/opentracks/data/models/Distance;	139	····invoke-direct·{v0,·p1},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V

140	····invoke-direct·{p1,·v0},·Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;-><init>(Lde/dennisguse/opentracks/data/models/Distance;)V

141	····iput-object·p1,·p0,·Lde/dennisguse/opentracks/services/announcement/VoiceAnnouncement;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;	140	····iput-object·v0,·p0,·Lde/dennisguse/opentracks/services/announcement/VoiceAnnouncement;->intervalStatistics:Lde/dennisguse/opentracks/ui/intervals/IntervalStatistics;

142	····return-void	141	····return-void
143	.end·method	142	.end·method

144	.method·private·onTtsReady()V	143	.method·private·onTtsReady()V
145	····.locals·3	144	····.locals·3


Offset 1, 107 lines modified		Offset 1, 108 lines modified
00000000:·7072·6f00·3031·3000·0140·4900·009f·0600··pro.010..@I.....		00000000:·7072·6f00·3031·3000·0140·4900·00a0·0600··pro.010..@I.....
00000010:·0078·01ed·9a5f·8815·7514·c7cf·dc3b·7bf7··.x..._..u....;{.		00000010:·0078·01ed·9a5f·8815·7514·c7cf·dc3b·7bf7··.x..._..u....;{.
00000020:·ae6e·eebd·dada·6a2b·~~8d7~~f·584d·37bb·d452··.n....j+..XM7..R		00000020:·ae6e·eebd·d6da·6a4a·e31f·d64d·37bb·d452··.n....jJ...M7..R
00000030:·4a19·b32a·2669·50f4·90be·6dd9·9291·8822··J..*&iP...m...."
00000040:·d446·ffe6·9ac1·9a6d·2c61·e043·c442·584b··.F.....m,a.C.BXK
00000050:·2f19·4150·444c·e683·82d0·4304·be48·1b05··/.APDL....C..H..
00000060:·1504·510f·5660·6be7·3333·6777·6eee·ba28··..Q.V`k.33gwn..(
00000070:·210a·bf9f·9cf9·9ddf·39df·f3e7·f79d·b933··!.......9......3
00000080:·b3de·3b5b·06e5·e7b2·c8bc·1d43·a58f·cf8b··..;[.......C....
00000090:·ecd8·f5d8·be7d·fdfb·563f·d13f·7070·9e48··.....}..V?.?pp.H
000000a0:·4944·7c15·6f0a·c1a7·9109·063f·7a41·c5b0··ID\|.o......?zA..
000000b0:·b355·df9c·ad8b·99af·359b·c198·0dfd·4e15··.U......5.....N.
000000c0:·66e2·d7aa·68e9·89ba·d447·96a8·ec54·a9aa··f...h....G...T..
000000d0:·3cab·82ad·53a5·5d03·f375·b137·a998·0ddd··<...S.]..u.7....
000000e0:·eacd·ca74·7ce0·6ca6·f7b9·990f·6c73·4ec7··...t\|.l.....lsN.
000000f0:·b740·657e·ce46·2c38·62d8·e78d·2af9·18f6··.@e~.F,8b...*...
00000100:·b63a·b359·7d62·e08c·38eb·8dd9·e2f2·7ccc··.:.Y}b..8.....\|.
00000110:·c970·56c7·62c0·e475·5bc3·abd9·c969·627e··.pV.b..u[....ib~
00000120:·d6ec·030c·f5ee·ca74·d616·0716·0c58·6c16··.......t.....Xl.
00000130:·7b30·b361·5f95·f9d8·2f7b·41c8·d7a2·020f··{0.a_.../{A.....
00000140:·96cb·f68c·8f9c·6bd4·812f·2f96·7f91·dac9··......k..//.....
00000150:·6d31·86c1·86ac·53c1·c639·303e·b013·cf8c··m1....S..90>....
00000160:·8f3e·cc87·7daf·0a9c·580d·7043·2a60·e907··.>..}...X.pC*`..
00000170:·7e8d·33d6·569b·7ef1·b5a9·80b5·fce8·c86e··~.3.V.~........n
00000180:·3d80·b925·5b9b·9dfa·d4e2·bac5·6675·b9de··=..%[.......fu..
00000190:·acce·dd99·9d9c·f005·06dd·84bc·e8f4·427d··..............B}
000001a0:·bb56·6d66·7f08·386a·5093·d97a·4727·0e0c··.Vmf..8jP..zG'..
000001b0:·fddd·a042·6df0·9c1b·ea11·637b·5bae·3a7b··...Bm.....c{[.:{
000001c0:·278e·ba96·171d·1bf2·a90a·6b8b·351f·33b1··'.........k.5.3.
000001d0:·160f·168c·71f9·bcea·d8e8·0d3b·6239·f333··....q......;b9.3
000001e0:·792c·bfd5·076b·9cd1·373d·e77d·d603·792c··y,...k..7=.}..y,
000001f0:·1e0c·fb25·166e·0d03·17ac·f9ec·a2b7·6990··...%.n........i.
00000200:·f5c2·356c·f116·c39a·3d80·e5ba·b45e·c98d··..5l....=....^..
00000210:·6e7b·36ee·c113·6bfb·e45c·a183·c347·2dab··n{6...k..\...G-.
00000220:·c79e·8803·c3bd·817c·f639·4707·470c·fab7··.......\|.9G.G...
00000230:·2~~af4~~·~~877e~~·~~bb0a~~·~~fb27~~·aff1·~~809~~d·~~bac4~~·~~2cd~~4··*..~...'....~~..,.~~		00000030:·2b65·ccaa·98a4·41d1·43fa·b6fd·595a·4944··+e....A.C...YZID
		00000040:·116a·a37f·b3b6·c19a·6d2c·61e0·43c4·4258··.j......m,a.C.BX
		00000050:·d24b·4610·1411·93f9·a020·f410·822f·d246··.KF......·.../.F
		00000060:·4105·41d4·8315·d8da·f9cc·ccd9·9d9b·bb2e··A.A.............
		00000070:·4a88·c2ef·2767·7ee7·77ce·f7fc·f97d·67ee··J...'g~.w....}g.
		00000080:·ccac·f7ce·9561·f9b9·2c72·6ac7·c8e9·4fce··.....a..,rj...O.
		00000090:·8b3c·b9f3·f1bd·7bfb·f6ae·79aa·6f60·ff8d··.<....{...y.o`..
		000000a0:·2225·11f1·55bc·6904·9f46·2618·fce8·0515··"%..U.i..F&.....
		000000b0:·c3ce·557d·73b6·2e66·bee6·6c06·6336·f4bb··..U}s..f..l.c6..
		000000c0:·5498·895f·aba2·a527·eb52·1f59·a6d2·af52··T.._...'.R.Y...R
		000000d0:·5579·4e05·db62·9556·0dcc·d7c5·dea0·6236··UyN..b.V......b6
		000000e0:·74ab·3727·d3f1·81b3·99de·e767·3eb0·8d39··t.7'.......g>..9
		000000f0:·1ddf·4295·0539·1bb1·e088·619f·37a9·e463··..B..9....a.7..c
		00000100:·d8db·9acc·66f5·8981·33e2·ac37·668b·cbf3··....f...3..7f...
		00000110:·312f·c359·1d8b·0193·d76d·0daf·6627·a789··1/.Y.....m..f'..
		00000120:·f959·b30f·30d4·bb3b·d359·5b1c·5830·60b1··.Y..0..;.Y[.X0`.
		00000130:·59ec·fecc·867d·75e6·63bf·ec05·215f·930a··Y....}u.c...!_..
		00000140:·3c58·2edb·333e·7276·ab03·5f5e·2cff·12b5··<X..3>rv.._^,...
		00000150:·93db·620c·830d·59a7·828d·7360·7c60·279e··..b...Y...s`\|`'.
		00000160:·191f·7d98·0ffb·1e15·38b1·1ae0·4654·c0d2··..}.....8...FT..
		00000170:·0ffc·1a67·acad·36fd·e26b·5101·6bf9·d191··...g..6..kQ.k...
		00000180:·5d7a·0073·6bb6·363b·f5a9·c575·8bcd·ea72··]z.sk.6;...u...r
		00000190:·bd59·9d7b·323b·39e1·0b0c·ba09·79d1·e985··.Y.{2;9.....y...
		000001a0:·fa76·adda·ccfe·1070·d4a0·26b3·f58e·4e1c··.v.....p..&...N.
		000001b0:·18fa·bb41·85da·e039·37d4·23c6·f6b6·5275··...A...97.#...Ru
		000001c0:·f64e·1c75·2d2f·3a36·e433·15d6·166b·3e66··.N.u-/:6.3...k>f
		000001d0:·622d·1e2c·18e3·f205·d5b1·d11b·76c4·72e6··b-.,........v.r.
		000001e0:·67f2·587e·ab0f·d638·a36f·7ace·fbac·07f2··g.X~...8.oz.....
		000001f0:·583c·18f6·4b2c·dc1a·062e·58f3·d945·6fd1··X<..K,....X..Eo.
		00000200:·20eb·856b·d8e2·2d86·357b·00cb·7569·bd92···..k..-.5{..ui..
		00000210:·1bdd·f66c·dc83·27d6·f6c9·b942·0787·8f5a··...l..'....B...Z
		00000220:·568f·3d11·0786·7b03·f9ec·738e·0e8e·18f4··V.=...{...s.....
		00000230:·d32a·f487·7e87·0afb·27af·f180·9dba·c42c··.*..~...'......,
00000240:·056b·ab83·8e9c~~·d4~~03·f9e8·dde2·88c1·6775··.k............gu		00000240:·d205·6bab·838e·9cd0·03f9·e8dd·e288·c167··..k............g
00000250:·0c3b·d50c·0766·47b7·18b3·db3a·9fcf·70ec··.;...fG....:..p.		00000250:·750c·3bdd·0c07·6647·b718·b3db·3a9f·cf70··u.;...fG....:..p
00000260:·957e·10f6·0cf6·2615·c382·c3ce·6c7d·83b1··.~....&.....l}..
00000270:·feb0·e57d·d607·76db·0bd7·86e5·c16f·b5e0··...}..v......o..
00000280:·c9f0·~~f9f3~~·~~c4bd~~·~~1a3c~~·~~e706~~·~~acf5~~·~~9fd7~~·2d1f··.......<......-.		00000260:·ec95·7e10·f60c·f666·15c3·82c3·ce6c·7d83··..~....f.....l}.
		00000270:·b1fe·b0e5·7dd6·0776·db0b·d786·e5c1·6fb5··....}..v......o.
		00000280:·e0c9·f0f9·f3c4·bd1a·3ce7·06ac·f59f·d72d··........<......-
00000290:·733e·273a·7589·213f·b9d0·11e2·f163·674d··s>':u.!?.....cgM		00000290:·1f73·3e27·3a75·8921·3fb9·d011·e2f1·6367··.s>':u.!?.....cg
000002a0:·2c82·8e1d·1d1f·f7af~~·e5~~2a·ec11·2e2c·eeb3··,........*...,..		000002a0:·4d2c·828e·1d1d·1ff7·af95·2aec·112e·2cee··M,........*...,.
000002b0:·7b27·fb05·9f17·cb81·cd74·9bf3·38d3·edb3··{'.......t..8...
000002c0:·9dc7·db5e·0cc3·6cb5·2f95·6b3a·1ff6·a972··...^..l./.k:...r
000002d0:·e66b·a2db·be1f·543d·5fd3·7ce4·99ae·461e··.k....T=_.\|...F.
000002e0:·6fbd·~~6e53~~·~~bc7d~~·~~c6f1~~·~~af52~~·~~b173~~·~~0dc6~~·~~f251~~··o.nS.}...R.s...Q		000002b0:·f3fb·a6fa·059f·17cb·81cd·749b·f338·d3ed··..........t..8..
		000002c0:·b39d·c7db·5e0c·c36c·b52f·956b·261f·f6e9··....^..l./.k&...
		000002d0:·72e6·6ba2·dbbe·1f52·3d5f·d37c·e499·a946··r.k....R=_.\|...F
		000002e0:·1e6f·bd6e·53bc·7dc6·f1af·56b1·730d·c6f2··.o.nS.}...V.s...
000002f0:·17d9~~·ad~~1f·2e70·33c9·8f05·5ff9·f092·7fcc··.....p3..._.....		000002f0:·5117·d9a5·1f2e·70b3·c98f·055f·f9f0·927f··Q.....p...._....
00000300:·be66·6555·d46a·ac52·5f59·354f·6b78·7afd··.feU.j.R_Y5Okxz.
00000310:·b4ab·ede1·0401·ca22·4baa·7764·ab52·822c··......."K.wd.R.,
00000320:·e835·5e54·69d1·5593·beb7·9021·8de8·48aa··.5^Ti.U....!..H.
00000330:·94d4·4785·3989·bd4d·8f05·c572·e45f·9a37··..G.9..M...r._.7
00000340:·3da6·b5d3·ee3c·bd33·7849·8f29·263d·deac··=....<.3xI.)&=..
00000350:·~~b666~~·~~cd9~~5·~~d698~~·~~eccb~~·~~d77e~~·~~b12f~~·~~d44e~~·~~5264~~··.~~f...~~...~~.~./.NRd~~		00000300:·ccbe·6665·55d4·6aac·525f·5935·4f6b·787a··..feU.j.R_Y5Okxz
		00000310:·fdb4·aaed·9104·01ca·224b·aab7·65ab·5282··........"K..e.R.
		00000320:·2ce8·355e·5469·d255·83be·b790·218d·684b··,.5^Ti.U....!.hK
		00000330:·aa94·d447·8579·89bd·458f·05c5·72e4·5f9a··...G.y..E...r._.
		00000340:·373d·a6b5·d3ee·3cbd·3378·498f·2926·3dde··7=....<.3xI.)&=.
		00000350:·a2b6·46cd·95d6·98ea·cbd7·7eb1·2fd2·4e52··..F.......~./.NR
00000360:·57a2·a123·e0d3·ecf4·5894~~·56~~6e·4f6e·3806··W..#....X.VnOn8.		00000360:·647b·a2a1·23e0·d3ec·f458·9466·6e4f·6e38··d{..#....X.fnOn8
00000370:·ae1e·03fb·ffea·0d6b·23c5·8a55·ac35·85df··.......k#..U.5..
00000380:·a47a·773a·8522·8f6f·44e5·a33c·31b8·7e1b··.zw:.".oD..<1.~.
00000390:·067f·1~~834~~·~~201a~~·~~bcb6~~·~~1859~~·~~dab3~~·550e·~~2d09~~··...4·....Y..U.-.		00000370:·06ae·1e03·fbfe·ea09·6b63·c58a·55ac·3584··........kc..U.5.
		00000380:·dfa6·7a67·3a85·224f·6c44·e5a3·3c39·b87e··..zg:."OlD..<9.~
		00000390:·eb06·7f18·d421·eabc·b618·5bde·b555·0e2c··.....!....[..U.,
000003a0:·242a·36~~eb·~~6d42·9f06·6f~~e8·~~2720·d0fb·0737··$*6.mB..o.'·...7		000003a0:·0b24·2a36·ea6d·429f·066f·ea27·20d0·fb07··.$*6.mB..o.'·...
000003b0:·6735·1ca8·eeaa·3f25·b5d5·5b4a·f107·dd7d··g5....?%..[J...}
000003c0:·ea60·0cb4·ece4·59d2·3046·9355·ab44·41d9··.`....Y.0F.U.DA.
000003d0:·2fc7·c7c3·b0c1·3bed·227e·525d·2b3e·cf9a··/.....;."~R]+>..
000003e0:·8f75·f151·cf20·0f85·c951·91ed·938b·4ceb··.u.Q.·...Q....L.
000003f0:·a888·1f47·353d·cab9·8b9c·9732·0410·3b30··...G5=.....2..;0
00000400:·2c72·5a0a·7d29·3068·dadc·bec2·9742·473c··,rZ.})0h.....BG<
00000410:·18f7·ad91·8ab2·1649·45ea·b2ac·9cbc·7a89··.......IE.....z.
00000420:·df7d·8c5b·ea14·e3f0·4893·ff76·3471·ae52··.}.[....H..v4q.R
00000430:·44b4·f8ef·b762·3f16·bffe·cbac·4258·e8d1··D....b?.....BX..
00000440:·3b6a·f267·da14·f139·d349·9151·69a7·f898··;j.g...9.I.Qi...
00000450:·d482·605b·342c·ebc3·5352·2ef0·84e6·fde0··..`[4,..SR......
00000460:·7d75·4d33·82f4·fd41·cfda·e23d·9156·9b69··}uM3...A...=.V.i
00000470:·d478·325e·d158·217e·e9cc·cb9d·4367·57c8··.x2^.X!~....CgW.
00000480:·9b23·22f1·92c1·ee78·e33b·b16c·acf5·aed1··.#"....x.;.l....
00000490:·4752·75f8·bdea·09bf·f8aa·c8ca·0dd5·21e5··GRu...........!.
000004a0:·25a0·4a45·8fc3·d377·0fc4·0dc7·8063·c031··%.JE...w.....c.1
000004b0:·e018·700c·3806·ae22·032f·9c1d·9778·e8eb··..p.8.."./...x..
000004c0:·f197·7ebf·67fd·44d9·23ef·8e9f·9e58·e8cb··..~.g.D.#....X..
000004d0:·50fa·f02e·3f52·750f·f149·5aae·7b2d·be70··P...?Ru..IZ.{-.p
000004e0:·dd6f·c16d·c031·e018·700c·3806·1c03·8e01··.o.m.1..p.8.....
000004f0:·c780·63c0·31e0·1870·0c38·061c·038e·01c7··..c.1..p.8......
00000500:·8063·c031·f0bf·3050·3bd1·366b·bfb7·68c4··.c.1..0P;.6k..h.
00000510:·9245·ebe4·8bae·6431·96fd·9f68·413a·96f2··.E....d1...hA:..
00000520:·43a8·f4eb·da0c·57d6·ef91·1bc6·6086·c8be··C.....W.....`...
Max diff block lines reached; -1/14771 bytes (-0.01%) of diff not shown.


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·13601596·bytes,·number·of·entries:·7219	1	Zip·file·size:·13601574·bytes,·number·of·entries:·7219
2	?rwxrwxr-x··2.0·unx······808·b-·stor·80-Jan-01·00:00·android/support/v4/app/INotificationSideChannel$_Parcel.class	2	?rwxrwxr-x··2.0·unx······808·b-·stor·80-Jan-01·00:00·android/support/v4/app/INotificationSideChannel$_Parcel.class
3	?rwxrwxr-x··2.0·unx······437·b-·stor·80-Jan-01·00:00·android/support/v4/app/INotificationSideChannel.class	3	?rwxrwxr-x··2.0·unx······437·b-·stor·80-Jan-01·00:00·android/support/v4/app/INotificationSideChannel.class
4	?rwxrwxr-x··2.0·unx······798·b-·stor·80-Jan-01·00:00·android/support/v4/os/IResultReceiver$_Parcel.class	4	?rwxrwxr-x··2.0·unx······798·b-·stor·80-Jan-01·00:00·android/support/v4/os/IResultReceiver$_Parcel.class
5	?rwxrwxr-x··2.0·unx······268·b-·stor·80-Jan-01·00:00·android/support/v4/os/IResultReceiver.class	5	?rwxrwxr-x··2.0·unx······268·b-·stor·80-Jan-01·00:00·android/support/v4/os/IResultReceiver.class
6	?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$1.class	6	?rwxrwxr-x··2.0·unx······623·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$1.class
7	?rwxrwxr-x··2.0·unx······575·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$MyRunnable.class	7	?rwxrwxr-x··2.0·unx······575·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver$MyRunnable.class
8	?rwxrwxr-x··2.0·unx·····1739·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver.class	8	?rwxrwxr-x··2.0·unx·····1739·b-·stor·80-Jan-01·00:00·android/support/v4/os/ResultReceiver.class
Offset 3385, 15 lines modified		Offset 3385, 15 lines modified
3385	?rwxrwxr-x··2.0·unx······720·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$$ExternalSyntheticLambda3.class	3385	?rwxrwxr-x··2.0·unx······720·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$$ExternalSyntheticLambda3.class
3386	?rwxrwxr-x··2.0·unx······661·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$1.class	3386	?rwxrwxr-x··2.0·unx······661·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$1.class
3387	?rwxrwxr-x··2.0·unx······662·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$2.class	3387	?rwxrwxr-x··2.0·unx······662·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$2.class
3388	?rwxrwxr-x··2.0·unx······673·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$3.class	3388	?rwxrwxr-x··2.0·unx······673·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$3.class
3389	?rwxrwxr-x··2.0·unx······769·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$Listener$-CC.class	3389	?rwxrwxr-x··2.0·unx······769·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$Listener$-CC.class
3390	?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$Listener.class	3390	?rwxrwxr-x··2.0·unx······533·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub$Listener.class
3391	?rwxrwxr-x··2.0·unx····10739·b-·defN·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub.class	3391	?rwxrwxr-x··2.0·unx····10739·b-·defN·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackDataHub.class
3392	?rwxrwxr-x··2.0·unx·····2361·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackPointIterator.class	3392	?rwxrwxr-x··2.0·unx·····2356·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackPointIterator.class
3393	?rwxrwxr-x··2.0·unx······842·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackSelection$$ExternalSyntheticLambda0.class	3393	?rwxrwxr-x··2.0·unx······842·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackSelection$$ExternalSyntheticLambda0.class
3394	?rwxrwxr-x··2.0·unx······397·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackSelection$$ExternalSyntheticLambda1.class	3394	?rwxrwxr-x··2.0·unx······397·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/TrackSelection$$ExternalSyntheticLambda1.class
3395	?rwxrwxr-x··2.0·unx·····1029·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/UUIDUtils.class	3395	?rwxrwxr-x··2.0·unx·····1029·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/UUIDUtils.class
3396	?rwxrwxr-x··2.0·unx······458·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/ActivityType$$ExternalSyntheticLambda0.class	3396	?rwxrwxr-x··2.0·unx······458·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/ActivityType$$ExternalSyntheticLambda0.class
3397	?rwxrwxr-x··2.0·unx·····4423·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/ActivityType.class	3397	?rwxrwxr-x··2.0·unx·····4423·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/ActivityType.class
3398	?rwxrwxr-x··2.0·unx······100·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/Altitude-IA.class	3398	?rwxrwxr-x··2.0·unx······100·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/Altitude-IA.class
3399	?rwxrwxr-x··2.0·unx······899·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/Altitude.class	3399	?rwxrwxr-x··2.0·unx······899·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/data/models/Altitude.class
Offset 3547, 15 lines modified		Offset 3547, 15 lines modified
3547	?rwxrwxr-x··2.0·unx······272·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection$Callback$-CC.class	3547	?rwxrwxr-x··2.0·unx······272·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection$Callback$-CC.class
3548	?rwxrwxr-x··2.0·unx······309·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection$Callback.class	3548	?rwxrwxr-x··2.0·unx······309·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection$Callback.class
3549	?rwxrwxr-x··2.0·unx·····4267·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection.class	3549	?rwxrwxr-x··2.0·unx·····4267·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceConnection.class
3550	?rwxrwxr-x··2.0·unx·····6802·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.class	3550	?rwxrwxr-x··2.0·unx·····6802·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/TrackRecordingServiceNotificationManager.class
3551	?rwxrwxr-x··2.0·unx······642·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$$ExternalSyntheticLambda0.class	3551	?rwxrwxr-x··2.0·unx······642·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$$ExternalSyntheticLambda0.class
3552	?rwxrwxr-x··2.0·unx·····1279·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$1.class	3552	?rwxrwxr-x··2.0·unx·····1279·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$1.class
3553	?rwxrwxr-x··2.0·unx·····1619·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$2.class	3553	?rwxrwxr-x··2.0·unx·····1619·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement$2.class
3554	?rwxrwxr-x··2.0·unx·····7048·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.class	3554	?rwxrwxr-x··2.0·unx·····7043·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncement.class
3555	?rwxrwxr-x··2.0·unx·····3885·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.class	3555	?rwxrwxr-x··2.0·unx·····3885·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementManager.class
3556	?rwxrwxr-x··2.0·unx······740·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils$1.class	3556	?rwxrwxr-x··2.0·unx······740·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils$1.class
3557	?rwxrwxr-x··2.0·unx·····6261·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.class	3557	?rwxrwxr-x··2.0·unx·····6261·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/announcement/VoiceAnnouncementUtils.class
3558	?rwxrwxr-x··2.0·unx·····1930·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.class	3558	?rwxrwxr-x··2.0·unx·····1930·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/handlers/EGM2008CorrectionManager.class
3559	?rwxrwxr-x··2.0·unx······448·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/handlers/GPSHandler$$ExternalSyntheticLambda0.class	3559	?rwxrwxr-x··2.0·unx······448·b-·stor·80-Jan-01·00:00·de/dennisguse/opentracks/services/handlers/GPSHandler$$ExternalSyntheticLambda0.class


Offset 46, 16 lines modified		Offset 46, 17 lines modified
46	····	46	····
47	····public·MutableLiveData·getIntervalStats(final·Track$Id·track$Id,·final·UnitSystem·unitSystem,·IntervalStatisticsModel$IntervalOption·option_1)·{	47	····public·MutableLiveData·getIntervalStats(final·Track$Id·track$Id,·final·UnitSystem·unitSystem,·IntervalStatisticsModel$IntervalOption·option_1)·{
48	········if·(this.intervalsLiveData·==·null)·{	48	········if·(this.intervalsLiveData·==·null)·{
49	············if·(option_1·==·null)·{	49	············if·(option_1·==·null)·{
50	················option_1·=·IntervalStatisticsModel$IntervalOption.OPTION_1;	50	················option_1·=·IntervalStatisticsModel$IntervalOption.OPTION_1;
51	············}	51	············}
52	············this.intervalsLiveData·=·new·MutableLiveData();	52	············this.intervalsLiveData·=·new·MutableLiveData();
53	············~~this.d~~istance~~Interval~~·=·option_1.getDistance(unitSystem);	53	············final·Distance·distance·=·option_1.getDistance(unitSystem);
		54	············this.distanceInterval·=·distance;
54	············this.intervalStatistics·=·new·IntervalStatistics(~~this.~~distanc~~eInt~~e~~rval~~);	55	············this.intervalStatistics·=·new·IntervalStatistics(distance);
55	············this.loadIntervalStatistics(track$Id);	56	············this.loadIntervalStatistics(track$Id);
56	········}	57	········}
57	········this.trackPointsTableObserver·=·(ContentObserver)new·IntervalStatisticsModel$1(this,·this.handler,·track$Id);	58	········this.trackPointsTableObserver·=·(ContentObserver)new·IntervalStatisticsModel$1(this,·this.handler,·track$Id);
58	········this.contentResolver.registerContentObserver(TrackPointsColumns.CONTENT_URI_BY_TRACKID,·false,·this.trackPointsTableObserver);	59	········this.contentResolver.registerContentObserver(TrackPointsColumns.CONTENT_URI_BY_TRACKID,·false,·this.trackPointsTableObserver);
59	········return·this.intervalsLiveData;	60	········return·this.intervalsLiveData;
60	····}	61	····}
61	····	62	····
Offset 82, 12 lines modified		Offset 83, 13 lines modified
82	····}	83	····}
83	····	84	····
84	····public·void·update(final·Track$Id·track$Id,·final·UnitSystem·unitSystem,·IntervalStatisticsModel$IntervalOption·default1)·{	85	····public·void·update(final·Track$Id·track$Id,·final·UnitSystem·unitSystem,·IntervalStatisticsModel$IntervalOption·default1)·{
85	········if·(default1·==·null)·{	86	········if·(default1·==·null)·{
86	············default1·=·IntervalStatisticsModel$IntervalOption.DEFAULT;	87	············default1·=·IntervalStatisticsModel$IntervalOption.DEFAULT;
87	········}	88	········}
88	········this.lastTrackPointId·=·null;	89	········this.lastTrackPointId·=·null;
89	········~~this.d~~istance~~Interval~~·=·default1.getDistance(unitSystem);	90	········final·Distance·distance·=·default1.getDistance(unitSystem);
		91	········this.distanceInterval·=·distance;
90	········this.intervalStatistics·=·new·IntervalStatistics(~~this.~~distanc~~eInt~~e~~rval~~);	92	········this.intervalStatistics·=·new·IntervalStatistics(distance);
91	········this.loadIntervalStatistics(track$Id);	93	········this.loadIntervalStatistics(track$Id);
92	····}	94	····}
93	}	95	}