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

⊟

61.2 MB

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

/home/fdroid/fdroiddata/tmp/sigcp_de.dennisguse.opentracks_5151.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: <8a0c09a485318cdd1d14f20dbcc2505bd5e04a15ee7941fd38e2ecf6de2d08ad>, actual: <60465d73d84720721a125a24b0a62144216f0facf90b498a5e72ed72d496ab0f> ERROR: APK Signature Scheme v3 signer #1: APK integrity check failed. VERITY_CHUNKED_SHA256 digest mismatch. Expected: <d125cd000fa283e6a2ecac595e29b0427ccea4ae1e3d33f72dd63f06e210ba6f1452600100000000>, actual: <164118e094ef5d9d29f53d981ff7b0ff18b8ed19e6b96926c68d89fb0b326f941452600100000000>

⊟

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············:·a4e~~e51~~44	4	checksum············:·ece00d45
5	signature···········:·~~f2b4~~...~~bcba~~	5	signature···········:·8e80...5370
6	file_size···········:·9464456	6	file_size···········:·9464436
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·····:·65885	10	string_ids_size·····:·65885
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········:·263652·(0x0405e4)	13	type_ids_off········:·263652·(0x0405e4)
Offset 15, 15 lines modified		Offset 15, 15 lines modified
15	proto_ids_off·······:·298188·(0x048ccc)	15	proto_ids_off·······:·298188·(0x048ccc)
16	field_ids_size······:·46440	16	field_ids_size······:·46440
17	field_ids_off·······:·461544·(0x070ae8)	17	field_ids_off·······:·461544·(0x070ae8)
18	method_ids_size·····:·64690	18	method_ids_size·····:·64690
19	method_ids_off······:·833064·(0x0cb628)	19	method_ids_off······:·833064·(0x0cb628)
20	class_defs_size·····:·7219	20	class_defs_size·····:·7219
21	class_defs_off······:·1350584·(0x149bb8)	21	class_defs_off······:·1350584·(0x149bb8)
22	data_size···········:·7882864	22	data_size···········:·7882844
23	data_off············:·1581592·(0x182218)	23	data_off············:·1581592·(0x182218)

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······:·6312	27	superclass_idx······:·6312
28	source_file_idx·····:·12649	28	source_file_idx·····:·12649
Offset 887992, 39 lines modified		Offset 887992, 38 lines modified
887992	······name··········:·'<init>'	887992	······name··········:·'<init>'
887993	······type··········:·'(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V'	887993	······type··········:·'(Lde/dennisguse/opentracks/data/ContentProviderUtils;Lde/dennisguse/opentracks/data/models/Track$Id;Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)V'
887994	······access········:·0x10001·(PUBLIC·CONSTRUCTOR)	887994	······access········:·0x10001·(PUBLIC·CONSTRUCTOR)
887995	······code··········-	887995	······code··········-
887996	······registers·····:·4	887996	······registers·····:·4
887997	······ins···········:·4	887997	······ins···········:·4
887998	······outs··········:·2	887998	······outs··········:·2
887999	······insns·size····:·23·16-bit·code·units	887999	······insns·size····:·21·16-bit·code·units
888000	3d22b0:········································\|[3d22b0]·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	888000	3d22b0:········································\|[3d22b0]·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
888001	3d22c0:·7010·e0bc·0000·························\|0000:·invoke-direct·{v0},·Ljava/lang/Object;.<init>:()V·//·method@bce0	888001	3d22c0:·7010·e0bc·0000·························\|0000:·invoke-direct·{v0},·Ljava/lang/Object;.<init>:()V·//·method@bce0
888002	3d22c6:·5b01·dfa2······························\|0003:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.contentProviderUtils:Lde/dennisguse/opentracks/data/ContentProviderUtils;·//·field@a2df	888002	3d22c6:·5b01·dfa2······························\|0003:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.contentProviderUtils:Lde/dennisguse/opentracks/data/ContentProviderUtils;·//·field@a2df
888003	3d22ca:·5b02·e2a2······························\|0005:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.trackId:Lde/dennisguse/opentracks/data/models/Track$Id;·//·field@a2e2	888003	3d22ca:·5b02·e2a2······························\|0005:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.trackId:Lde/dennisguse/opentracks/data/models/Track$Id;·//·field@a2e2
888004	3d22ce:·7020·95ad·3000·························\|0007:·invoke-direct·{v0,·v3},·Lde/dennisguse/opentracks/data/TrackPointIterator;.getCursor:(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;·//·method@ad95	888004	3d22ce:·7020·95ad·3000·························\|0007:·invoke-direct·{v0,·v3},·Lde/dennisguse/opentracks/data/TrackPointIterator;.getCursor:(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;·//·method@ad95
888005	3d22d4:·0c01···································\|000a:·move-result-object·v1	888005	3d22d4:·0c01···································\|000a:·move-result-object·v1
888006	3d22d6:·5b01·e0a2······························\|000b:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0	888006	3d22d6:·5b01·e0a2······························\|000b:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0
888007	3d22da:·2201·dc15······························\|000d:·new-instance·v1,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·type@15dc	888007	3d22da:·2202·dc15······························\|000d:·new-instance·v2,·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·type@15dc
888008	3d22de:·5402·e0a2······························\|000f:·iget-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0
888009	3d22e2:·7020·ceac·2100·························\|0011:·invoke-direct·{v1,·v2},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;.<init>:(Landroid/database/Cursor;)V·//·method@acce	888008	3d22de:·7020·ceac·1200·························\|000f:·invoke-direct·{v2,·v1},·Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;.<init>:(Landroid/database/Cursor;)V·//·method@acce
888010	3d22e8:·5b01·e1a2······························\|0014:·iput-object·v1,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·field@a2e1	888009	3d22e4:·5b02·e1a2······························\|0012:·iput-object·v2,·v0,·Lde/dennisguse/opentracks/data/TrackPointIterator;.indexes:Lde/dennisguse/opentracks/data/CachedTrackPointsIndexes;·//·field@a2e1
888011	3d22ec:·0e00···································\|0016:·return-void	888010	3d22e8:·0e00···································\|0014:·return-void
888012	······catches·······:·(none)	888011	······catches·······:·(none)
888013	······positions·····:·	888012	······positions·····:·
888014	········0x0000·line=26	888013	········0x0000·line=26
888015	········0x0003·line=27	888014	········0x0003·line=27
888016	········0x0005·line=28	888015	········0x0005·line=28
888017	········0x0007·line=30	888016	········0x0007·line=30
888018	········0x000d·line=31	888017	········0x000d·line=31
888019	······locals········:·	888018	······locals········:·
888020	········0x0000·-·0x0017·reg=0·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888019	········0x0000·-·0x0015·reg=0·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·
888021	········0x0000·-·0x0017·reg=1·(null)·Lde/dennisguse/opentracks/data/ContentProviderUtils;·	888020	········0x0000·-·0x0015·reg=1·(null)·Lde/dennisguse/opentracks/data/ContentProviderUtils;·
888022	········0x0000·-·0x0017·reg=2·(null)·Lde/dennisguse/opentracks/data/models/Track$Id;·	888021	········0x0000·-·0x0015·reg=2·(null)·Lde/dennisguse/opentracks/data/models/Track$Id;·
888023	········0x0000·-·0x0017·reg=3·(null)·Lde/dennisguse/opentracks/data/models/TrackPoint$Id;·	888022	········0x0000·-·0x0015·reg=3·(null)·Lde/dennisguse/opentracks/data/models/TrackPoint$Id;·

888024	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)	888023	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)
888025	······name··········:·'getCursor'	888024	······name··········:·'getCursor'
888026	······type··········:·'(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;'	888025	······type··········:·'(Lde/dennisguse/opentracks/data/models/TrackPoint$Id;)Landroid/database/Cursor;'
888027	······access········:·0x0002·(PRIVATE)	888026	······access········:·0x0002·(PRIVATE)
888028	······code··········-	888027	······code··········-
888029	······registers·····:·4	888028	······registers·····:·4
Offset 888050, 21 lines modified		Offset 888049, 21 lines modified
888050	······type··········:·'()V'	888049	······type··········:·'()V'
888051	······access········:·0x0001·(PUBLIC)	888050	······access········:·0x0001·(PUBLIC)
888052	······code··········-	888051	······code··········-
888053	······registers·····:·2	888052	······registers·····:·2
888054	······ins···········:·1	888053	······ins···········:·1
888055	······outs··········:·1	888054	······outs··········:·1
888056	······insns·size····:·11·16-bit·code·units	888055	······insns·size····:·11·16-bit·code·units
888057	3d22f0:········································\|[3d22f0]·de.dennisguse.opentracks.data.TrackPointIterator.close:()V	888056	3d22ec:········································\|[3d22ec]·de.dennisguse.opentracks.data.TrackPointIterator.close:()V
888058	3d2~~300~~:·5410·e0a2······························\|0000:·iget-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0	888057	3d22fc:·5410·e0a2······························\|0000:·iget-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0
888059	3d2304:·3800·0800······························\|0002:·if-eqz·v0,·000a·//·+0008	888058	3d2300:·3800·0800······························\|0002:·if-eqz·v0,·000a·//·+0008
888060	3d2308:·7210·4304·0000·························\|0004:·invoke-interface·{v0},·Landroid/database/Cursor;.close:()V·//·method@0443	888059	3d2304:·7210·4304·0000·························\|0004:·invoke-interface·{v0},·Landroid/database/Cursor;.close:()V·//·method@0443
888061	3d230e:·1200···································\|0007:·const/4·v0,·#int·0·//·#0	888060	3d230a:·1200···································\|0007:·const/4·v0,·#int·0·//·#0
888062	3d2310:·5b10·e0a2······························\|0008:·iput-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0	888061	3d230c:·5b10·e0a2······························\|0008:·iput-object·v0,·v1,·Lde/dennisguse/opentracks/data/TrackPointIterator;.cursor:Landroid/database/Cursor;·//·field@a2e0
888063	3d2314:·0e00···································\|000a:·return-void	888062	3d2310:·0e00···································\|000a:·return-void
888064	······catches·······:·(none)	888063	······catches·······:·(none)
888065	······positions·····:·	888064	······positions·····:·
888066	········0x0000·line=62	888065	········0x0000·line=62
888067	········0x0004·line=63	888066	········0x0004·line=63
888068	········0x0008·line=64	888067	········0x0008·line=64
888069	······locals········:·	888068	······locals········:·
888070	········0x0000·-·0x000b·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888069	········0x0000·-·0x000b·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·
Offset 888074, 17 lines modified		Offset 888073, 17 lines modified
888074	······type··········:·'(Ljava/util/function/Consumer;)V'	888073	······type··········:·'(Ljava/util/function/Consumer;)V'
888075	······access········:·0x1001·(PUBLIC·SYNTHETIC)	888074	······access········:·0x1001·(PUBLIC·SYNTHETIC)
888076	······code··········-	888075	······code··········-
888077	······registers·····:·2	888076	······registers·····:·2
888078	······ins···········:·2	888077	······ins···········:·2
888079	······outs··········:·2	888078	······outs··········:·2
888080	······insns·size····:·4·16-bit·code·units	888079	······insns·size····:·4·16-bit·code·units
888081	3d2318:········································\|[3d2318]·de.dennisguse.opentracks.data.TrackPointIterator.forEachRemaining:(Ljava/util/function/Consumer;)V	888080	3d2314:········································\|[3d2314]·de.dennisguse.opentracks.data.TrackPointIterator.forEachRemaining:(Ljava/util/function/Consumer;)V
888082	3d2328:·7120·efba·1000·························\|0000:·invoke-static·{v0,·v1},·Lj$/util/Iterator$-CC;.$default$forEachRemaining:(Ljava/util/Iterator;Ljava/util/function/Consumer;)V·//·method@baef	888081	3d2324:·7120·efba·1000·························\|0000:·invoke-static·{v0,·v1},·Lj$/util/Iterator$-CC;.$default$forEachRemaining:(Ljava/util/Iterator;Ljava/util/function/Consumer;)V·//·method@baef
888083	3d232e:·0e00···································\|0003:·return-void	888082	3d232a:·0e00···································\|0003:·return-void
888084	······catches·······:·(none)	888083	······catches·······:·(none)
888085	······positions·····:·	888084	······positions·····:·
888086	······locals········:·	888085	······locals········:·

888087	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)	888086	····#2··············:·(in·Lde/dennisguse/opentracks/data/TrackPointIterator;)
888088	······name··········:·'getCount'	888087	······name··········:·'getCount'
888089	······type··········:·'()I'	888088	······type··········:·'()I'
Offset 888190, 18 lines modified		Offset 888189, 18 lines modified
888190	······type··········:·'()V'	888189	······type··········:·'()V'
888191	······access········:·0x0001·(PUBLIC)	888190	······access········:·0x0001·(PUBLIC)
888192	······code··········-	888191	······code··········-
888193	······registers·····:·2	888192	······registers·····:·2
888194	······ins···········:·1	888193	······ins···········:·1
888195	······outs··········:·1	888194	······outs··········:·1
888196	······insns·size····:·6·16-bit·code·units	888195	······insns·size····:·6·16-bit·code·units
888197	3d2330:········································\|[3d2330]·de.dennisguse.opentracks.data.TrackPointIterator.remove:()V	888196	3d232c:········································\|[3d232c]·de.dennisguse.opentracks.data.TrackPointIterator.remove:()V
888198	3d2340:·2200·bd18······························\|0000:·new-instance·v0,·Ljava/lang/UnsupportedOperationException;·//·type@18bd	888197	3d233c:·2200·bd18······························\|0000:·new-instance·v0,·Ljava/lang/UnsupportedOperationException;·//·type@18bd
888199	3d2344:·7010·94bd·0000·························\|0002:·invoke-direct·{v0},·Ljava/lang/UnsupportedOperationException;.<init>:()V·//·method@bd94	888198	3d2340:·7010·94bd·0000·························\|0002:·invoke-direct·{v0},·Ljava/lang/UnsupportedOperationException;.<init>:()V·//·method@bd94
888200	3d234a:·2700···································\|0005:·throw·v0	888199	3d2346:·2700···································\|0005:·throw·v0
888201	······catches·······:·(none)	888200	······catches·······:·(none)
888202	······positions·····:·	888201	······positions·····:·
888203	········0x0000·line=70	888202	········0x0000·line=70
888204	······locals········:·	888203	······locals········:·
888205	········0x0000·-·0x0006·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·	888204	········0x0000·-·0x0006·reg=1·this·Lde/dennisguse/opentracks/data/TrackPointIterator;·

Max diff block lines reached; 64063318/64073544 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:·23093780·bytes,·number·of·entries:·1079	1	Zip·file·size:·23093780·bytes,·number·of·entries:·1079
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·····1716·b-·stor·81-Jan-01·01:01·assets/dexopt/baseline.prof	3	-rw-r--r--··0.0·unx·····1715·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··9464456·b-·defN·81-Jan-01·01:01·classes.dex	5	-rw-r--r--··0.0·unx··9464436·b-·defN·81-Jan-01·01:01·classes.dex
6	-rw-r--r--··0.0·unx···580684·b-·defN·81-Jan-01·01:01·classes2.dex	6	-rw-r--r--··0.0·unx···580684·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 1074, 8 lines modified		Offset 1074, 8 lines modified
1074	-rw----·····0.0·fat······592·b-·defN·81-Jan-01·01:01·res/zN.xml	1074	-rw----·····0.0·fat······592·b-·defN·81-Jan-01·01:01·res/zN.xml
1075	-rw----·····0.0·fat······400·b-·defN·81-Jan-01·01:01·res/z_.xml	1075	-rw----·····0.0·fat······400·b-·defN·81-Jan-01·01:01·res/z_.xml
1076	-rw----·····0.0·fat······840·b-·defN·81-Jan-01·01:01·res/zq.xml	1076	-rw----·····0.0·fat······840·b-·defN·81-Jan-01·01:01·res/zq.xml
1077	-rw----·····0.0·fat··1763720·b-·stor·81-Jan-01·01:01·resources.arsc	1077	-rw----·····0.0·fat··1763720·b-·stor·81-Jan-01·01:01·resources.arsc
1078	-rw----·····2.0·fat····98086·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.SF	1078	-rw----·····2.0·fat····98086·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.SF
1079	-rw----·····2.0·fat·····1334·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.RSA	1079	-rw----·····2.0·fat·····1334·b-·defN·81-Jan-01·01:01·META-INF/8CD9656E.RSA
1080	-rw----·····2.0·fat····97959·b-·defN·81-Jan-01·01:01·META-INF/MANIFEST.MF	1080	-rw----·····2.0·fat····97959·b-·defN·81-Jan-01·01:01·META-INF/MANIFEST.MF
1081	1079·files,·31787941·bytes·uncompressed,·22965~~659~~·bytes·compressed:··27.8%	1081	1079·files,·31787920·bytes·uncompressed,·22965547·bytes·compressed:··27.8%


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, 108 lines modified		Offset 1, 108 lines modified
00000000:·7072·6f00·3031·3000·0140·4900·00a3·0600··pro.010..@I.....		00000000:·7072·6f00·3031·3000·0140·4900·00a2·0600··pro.010..@I.....
00000010:·0078·01ed·9a6f·6855·7518·c79f·73ef·dd76··.x...ohUu...s..v		00000010:·0078·01ed·9a6f·6855·7518·c79f·73ef·dd76··.x...ohUu...s..v
00000020:·3697·ded9·b6ae·6bda·ddac·8c14·1b29·b5c2··6.....k......)..		00000020:·3697·ded9·b6ae·73da·ddac·8c14·1b29·b5c0··6.....s......)..
00000030:·e84c·574c·499b·60a0·6476·3435·111b·8681··.LWLI.`.dv45....		00000030:·e84c·574c·499d·60a0·6476·3435·111b·8681··.LWLI.`.dv45....
00000040:·422f·7636·4c26·958c·a0da·9~~bc8~~·~~a037~~·~~f54a~~··B/v6L&.......7.J		00000040:·422f·7636·4c26·958c·a0f2·9d06·bde9·9df8··B/v6L&..........
00000050:·7c21·9451·53c4·2482·2409·7c39·24a2·4068··\|!.QS.$.$.\|9$.@h
00000060:·f4ca·4059·cfe7·9ef3·dc9d·6bbb·da1f·1292··..@Y......k.....
00000070:·df6f·3ce7·f7fc·9ee7·fbfc·f97d·cfb9·e7dc··.o<........}....
00000080:·71cf·2c19·919f·7d91·5f1f·fff4·83e3·5745··q.,...}._.....WE
00000090:·5eda·b375·dfbe·1dfb·966e·df71·e0f0·9d22··^..u.....n.q..."
000000a0:·b522·9253·f166·107c·1a59·c2e0·47cf·a818··.".S.f.\|.Y..G...
000000b0:·7696·ea7d·c93a·9bf8·1a93·198c·d9d0·97a9··v..}.:..........
000000c0:·3013·ff98·8a96·2ed7·a53e·d2a9·b24b·a549··0........>...K.I
000000d0:·65bf·0ab6·7695·160d·4cd7·c55e·a362·3674··e...v...L..^.b6t
000000e0:·abd7·90e8·f8c0·d94c·ef73·131f·d8ba·948e··.......L.s......
000000f0:·6f9e·4a4b·ca46·2c38·62d8·67b3·4a3a·86bd··o.JK.F,8b.g.J:..
00000100:·2d4d·6c56·9f18·3823·ce7a·63b6·b834·1fb3··-MlV..8#.zc..4..
00000110:·139c·d5b1·1830·69dd·d6f0·6a76·729a·989f··.....0i...jvr...
00000120:·35fb·0043·bd47·129d·b5c5·8105·0316·9bc5··5..C.G..........
00000130:·1e4e·6cd8·1727·3ef6·cb5e·10f2·d5ab·c083··.Nl..'>..^......
00000140:·e5b2·3de3·2367·b73a·f0a5·c5f2·cf57·3bb9··..=.#g.:.....W;.
00000150:·2dc6·30d8·9027·54b0·710e·8c0f·ecc4·33e3··-.0..'T.q.....3.
00000160:·a30f·f361·7f55·054e·ac06·b8b7·55c0·d20f··...a.U.N....U...
00000170:·fc1a·67ac·ad36·fde2·9ba3·02d6·f2a3·2303··..g..6........#.
00000180:·7a00·734f·b236·3bf5·a9c5·758b·cdea·72bd··z.sO.6;...u...r.
00000190:·599d·4713·3b39·e10b·0cba·0979·d1e9·85fa··Y.G.;9.....y....
000001a0:·76ad·dacc·fe10·70d4·a026·b3f5·8e4e·1c18··v.....p..&...N..
000001b0:·fabb·4385·dae0·3937·d423·c6f6·b648·75f6··..C...97.#...Hu.
000001c0:·4e1c·752d·2f3a·36e4·3315·d616·6b3e·6662··N.u-/:6.3...k>fb
000001d0:·2d1e·2c18·e3f2·75d5·b1d1·1b76·c472·a667··-.,...u....v.r.g
000001e0:·f258·7eab·0fd6·38a3·6f7a·4efb·ac07·f258··.X~...8.ozN....X
000001f0:·3c18·f64b·2cdc·1a06·2e58·b7aa·a0cf·d120··<..K,....X.....·
00000200:·eb85·6bd8·e22d·8635·7b00·cb75·69bd·921b··..k..-.5{..ui...
00000210:·ddf6·6cdc·8327·d6f6·c9b9·4207·878f·5a56··..l..'....B...ZV
00000220:·8f3d·1107·867b·03f9·ec73·8e0e·8e18·f41f··.=...{...s......
00000230:·54e8·0ffd·2115·f64f·5ee3·013b·7589·69d3··T...!..O^..;u.i.
00000240:·056b·ab83·8e9c·d303·f9e8·dde2·88c1·6775··.k............gu
00000250:·0c3b·d30c·0766·47b7·18b3·db3a·9dcf·70ec··.;...fG....:..p.
00000260:·957e·10f6·0cf6·2e15·c382·c3ce·6c7d·83b1··.~..........l}..
00000270:·feb0·a57d·d607·76db·0bd7·86e5·c16f·b5e0··...}..v......o..
00000280:·c9f0·e9f3·c4bd·1a3c·e706·acf5·9fd6·2d1f··.......<......-.
00000290:·733a·273a·7589·213f·b9d0·11e2·f163·674d··s:':u.!?.....cgM
000002a0:·2c82·8e1d·1d1f·f7af·452a·ec11·2e2c·eef3··,.......E*...,..
000002b0:·15d3·fd82·4f8b·e5c0·66ba·cd69·9ce9·f6d9··....O...f..i....
000002c0:·4ee3·6d2f·8661·b6da·37ca·55cd·877d·a69c··N.m/.a..7.U..}..
000002d0:·e99a·e8b6·efb5·aaa7·6b9a·8f3c·d56a·a4f1··........k..<.j..
000002e0:·d6eb·46c5·db67·1cff·6215·3bd7·602c·1f75··..F..g..b.;.`,.u
000002f0:·9101·fd70·81bb·99fc·98c9·291f·5ee9·8f39··...p......).^..9
00000300:·a759·5965·b51a·abd8·e7ab·e669·0d4f·af9f··.YYe.......i.O..
00000310:·16b5·ad2f·2140·5964·adea·8564·555b·4266··.../!@Yd...dU[Bf
00000320:·f41a·cfaa·d4eb·aa46·bfb7·9021·8e28·94aa··.......F...!.(..
00000330:·d4aa·8f0a·b34b·f639·7acc·2896·237f·71de··.....K.9z.(.#.q.
00000340:·f818·d78e·bbf3·f4ce·e095·7a8c·31f1·f16e··..........z.1..n
00000350:·b5d5·69ae·b8c6·745f·39ed·177b·9b76·1223··..i...t_9..{.v.#
00000360:·ef2f·69e8·08f8·383b·3d66·a591·db93·1b8e··./i...8;=f......
00000370:·815b·c7c0·f095·9ea0·eb68·366f·15bb·6a82··.[.......h6o..j.
00000380:·0bb1·be24·9e02·916d·bda8·7c94·cb83·ebb7··...$...m..\|.....
00000390:·62f0·8f41·05a2·c26b·8ba3·0b97·3f23·6f76··b..A...k....?#ov
000003a0:·1625·cad6·e96d·429f·065f·ebbd·438b·0ff1··.%...mB.._..C...
000003b0:·e54d·6f1d·a7fd·13e3·cba5·f0fe·7dd9·f0b9··.Mo.........}...
000003c0:·d6ae·a4ab·2f72·cbb9·c754·8c0d·a555·ad04··..../r...T...U..
000003d0:·f95c·2617·6e2d·162b·bc55·1713·cbd4·d5bc··.\&.n-.+.U......
000003e0:·25e9·3414·8936·b69d·e186·353d·fc28·d9f9··%.4..6....5=.(..
000003f0:·b449·1a7d·c984·4141·8fc2·b7ab·bf3e·f23c··.I.}..AA.....>.<
00000400:·f056·f489·ec14·af2b·0e1b·cd7c·dcd0·ac9f··.V.....+...\|....
00000410:·fec6·b037·ec6a·d77f·0145·02f1·a340·e6e6··...7.j...E...@..
00000420:·4a8f·65c9·b45e·acc2·e49a·f399·ccba·8094··J.e..^..........
00000430:·a931·3e7a·754d·9809·6578·fcb5·1aaf·e8b5··.1>zuM..ex......
00000440:·7919·89ae·83a4·d0a6·6e17·d910·3550·7caf··y.......n...5P\|.
00000450:·14f2·f925·419f·741c·dd2e·392f·2623·1b25··...%A.t...9/&#.%
00000460:·5781·e1d3·b39e·96f8·7c0c·e5bb·83eb·ae83··W.......\|.......
00000470:·34ce·f431·9ede·ff68·344b·267b·f9c9·2367··4..1...h4K&{..#g
00000480:·079a·6575·bf48·d8d4·db1a·763e·1b4a·e758··..eu.H....v>.J.X
00000490:·b17d·896e·b3ef·82bf·6d78·68a5·c8bb·1f8d··.}.n....mxh.....
000004a0:·3cad·9b2e·5d30·be1e·cffd·a372·2ec8·31e0··<...]0.....r..1.
000004b0:·1870·0c38·061c·038e·81ff·8281·2f07·0665··.p.8......../..e
000004c0:·e2ec·cb83·5f5d·99df·51ce·ffed·fac1·9de5··...._]..Q.......
000004d0:·857e·198a·1fde·073f·e1db·891b·b70b·0313··.~.....?........
000004e0:·~~83b7~~·~~cb4e~~·~~dc3e~~·~~1c03~~·~~8e01~~·~~c780~~·~~63c0~~·~~31e0~~··...N.>....~~..c~~.1.		00000050:·4228·a3a6·8849·0449·12f8·7248·4481·2f46··B(...I.I..rHD./F
		00000060:·af0c·94f5·7cee·39cf·ddb9·b6ab·6524·347e··....\|.9.....e$4~
		00000070:·bff1·9cdf·f37b·9eef·f3e7·f73d·e79e·73c7··.....{.....=..s.
		00000080:·3db3·6444·7ef5·4536·9cb8·38ff·f44d·91d7··=.dD~.E6..8..M..
		00000090:·f76d·3f70·60d7·8165·3b77·1d3a·faa0·48ad··.m?p`..e;w.:..H.
		000000a0:·88e4·54bc·6904·9f46·9630·f8d1·332a·869d··..T.i..F.0..3*..
		000000b0:·a57a·5fb2·ce26·bec6·6406·6336·f4e5·2acc··.z_..&..d.c6..*.
		000000c0:·c43f·aba2·a5cb·75a9·8f74·aaec·5169·5239··.?....u..t..QiR9
		000000d0:·a882·ad5d·a545·03d3·75b1·d7a8·980d·ddea··...].E..u.......
		000000e0:·3524·3a3e·7036·d3fb·dcc4·07b6·2ea5·e39b··5$:>p6..........
		000000f0:·a7d2·92b2·110b·8e18·f6d9·ac92·8e61·6fcb··.............ao.
		00000100:·129b·d527·06ce·88b3·de98·2d2e·cdc7·ec04··...'......-.....
		00000110:·6775·2c06·4c5a·b735·bc9a·9d9c·26e6·67cd··gu,.LZ.5....&.g.
		00000120:·3ec0·50ef·e944·676d·7160·c180·c566·b147··>.P..Dgmq`...f.G
		00000130:·131b·f625·898f·fdb2·1784·7cf5·2af0·60b9··...%......\|.*.`.
		00000140:·6ccf·f8c8·d9ad·0e7c·69b1·fc0b·d44e·6e8b··l......\|i....Nn.
		00000150:·310c·36e4·3915·6c9c·03e3·033b·f1cc·f8e8··1.6.9.l....;....
		00000160:·c37c·d8df·5281·13ab·01ee·0315·b0f4·03bf··.\|..R...........
		00000170:·c619·6bab·4dbf·f8e6·a880·b5fc·e8c8·801e··..k.M...........
		00000180:·c03c·9cac·cd4e·7d6a·71dd·62b3·ba5c·6f56··.<...N}jq.b..\oV
		00000190:·e799·c44e·4ef8·0283·6e42·5e74·7aa1·be5d··...NN...nB^tz..]
		000001a0:·ab36·b33f·041c·35a8·c96c·bda3·1307·86fe··.6.?..5..l......
		000001b0:·1e50·a136·78ce·0df5·88b1·bd2d·569d·bd13··.P.6x......-V...
		000001c0:·475d·cb8b·8e0d·f942·85b5·c59a·8f99·588b··G].....B......X.
		000001d0:·070b·c6b8·7c47·756c·f486·1db1·9ce9·993c··....\|Gul.......<
		000001e0:·96df·ea83·35ce·e89b·9ed3·3eeb·813c·160f··....5.....>..<..
		000001f0:·86fd·120b·b786·810b·d6ad·2ae8·7334·c87a··..........*.s4.z
		00000200:·e11a·b678·8b61·cd1e·c072·5d5a·afe4·46b7··...x.a...r]Z..F.
		00000210:·3d1b·f7e0·89b5·7d72·aed0·c1e1·a396·d563··=.....}r.......c
		00000220:·4fc4·81e1·de40·3efb·9ca3·8323·06fd·2715··O....@>....#..'.
		00000230:·fa43·7f52·85fd·93d7·78c0·4e5d·62da·74c1··.C.R....x.N]b.t.
		00000240:·daea·a023·97f4·403e·7ab7·3862·f059·1dc3··...#..@>z.8b.Y..
		00000250:·4e37·c381·d9d1·2dc6·ecb6·4ee7·331c·7ba5··N7....-...N.3.{.
		00000260:·1f84·3d83·7d48·c5b0·e0b0·335b·df60·ac3f··..=.}H....3[.`.?
		00000270:·6c69·9ff5·81dd·f6c2·b561·79f0·5b2d·7832··li.......ay.[-x2
		00000280:·7cfa·3c71·af06·cfb9·016b·fda7·75cb·c79c··\|.<q.....k..u...
		00000290:·ce89·4e5d·62c8·4f2e·7484·78fc·d859·138b··..N]b.O.t.x..Y..
		000002a0:·a063·47c7·c7fd·6bb1·0a7b·840b·8bfb·72e5··.cG...k..{....r.
		000002b0:·54bf·e0d3·6239·b099·6e73·1a67·ba7d·b6d3··T...b9..ns.g.}..
		000002c0:·78db·8b61·98ad·f69d·7255·f361·9f2e·67ba··x..a....rU.a..g.
		000002d0:·26ba·ed7b·9dea·e99a·e623·4fb5·1a69·bcf5··&..{.....#O..i..
		000002e0:·ba59·f1f6·19c7·bf44·c5ce·3518·cb47·5d64··.Y.....D..5..G]d
		000002f0:·403f·5ce0·ee26·3f67·72ca·8757·fa63·ce69··@?\..&?gr..W.c.i
		00000300:·5656·59ad·c62a·f6f9·aa79·5ac3·d3eb·a745··VVY..*...yZ....E
		00000310:·6d1b·4b08·5016·59ab·7a21·59d5·9690·19bd··m.K.P.Y.z!Y.....
		00000320:·c6b3·2af5·baaa·d1ef·2d64·8823·0aa5·2ab5··.......-d.#...
		00000330:·eaa3·c2ec·927d·8e1e·338a·e5c8·5f9c·373e··.....}..3..._.7>
		00000340:·c6b5·e3ee·3cbd·3378·a51e·634c·7c9c·afb6··....<.3x..cL\|...
		00000350:·3acd·15d7·98ea·2ba7·fd62·6fd3·4e62·e463··:.....+..bo.Nb.c
Max diff block lines reached; -1/14830 bytes (-0.01%) of diff not shown.


Offset 1, 8 lines modified		Offset 1, 8 lines modified
1	Zip·file·size:·13601~~816~~·bytes,·number·of·entries:·7219	1	Zip·file·size:·13601794·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	}