diff --git a/app/orion/release/output-metadata.json b/app/orion/release/output-metadata.json index e39dd2a5..f9e861d8 100644 --- a/app/orion/release/output-metadata.json +++ b/app/orion/release/output-metadata.json @@ -16,8 +16,8 @@ } ], "attributes": [], - "versionCode": 581, - "versionName": "Build 1.6.1", + "versionCode": 580, + "versionName": "Build | Dark-Origin 1.1.0.12", "outputFile": "app-orion-x86_64-release.apk" }, { @@ -29,23 +29,10 @@ } ], "attributes": [], - "versionCode": 581, - "versionName": "Build 1.6.1", + "versionCode": 580, + "versionName": "Build | Dark-Origin 1.1.0.12", "outputFile": "app-orion-x86-release.apk" }, - { - "type": "ONE_OF_MANY", - "filters": [ - { - "filterType": "ABI", - "value": "arm64-v8a" - } - ], - "attributes": [], - "versionCode": 581, - "versionName": "Build 1.6.1", - "outputFile": "app-orion-arm64-v8a-release.apk" - }, { "type": "ONE_OF_MANY", "filters": [ @@ -55,9 +42,22 @@ } ], "attributes": [], - "versionCode": 581, - "versionName": "Build 1.6.1", + "versionCode": 580, + "versionName": "Build | Dark-Origin 1.1.0.12", "outputFile": "app-orion-armeabi-v7a-release.apk" + }, + { + "type": "ONE_OF_MANY", + "filters": [ + { + "filterType": "ABI", + "value": "arm64-v8a" + } + ], + "attributes": [], + "versionCode": 580, + "versionName": "Build | Dark-Origin 1.1.0.12", + "outputFile": "app-orion-arm64-v8a-release.apk" } ], "elementType": "File" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 04095d33..cc2272de 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -130,12 +130,12 @@ android:name="com.hiddenservices.onionservices.appManager.settingManager.searchEngineManager.settingSearchController" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:windowSoftInputMode="adjustPan" /> - + - + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index a48778e4..6ac81611 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_tor.png b/app/src/main/res/drawable-hdpi/ic_tor.png index a9b5cf35..474f1d62 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_tor.png and b/app/src/main/res/drawable-hdpi/ic_tor.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 1561e16d..2f8a7303 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 22ecd55b..e4a5e082 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 0b2bd8ac..a34035fa 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index d7173d19..51446637 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index d2f9da20..99551b58 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index d60c939c..9d030de2 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 53eee551..66cc3b84 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 6f8faa0f..0306a313 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 03e40caf..9ee2dc57 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 3a1f13f8..83fb5ba0 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index bbc3c616..de6abcff 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 19a3d709..2d680c4d 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 79bf7026..68f80a62 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4305594c..8c640a58 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/build.gradle b/build.gradle index f829c454..e5b0a571 100755 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.gms:google-services:4.3.15' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" } } diff --git a/build/kotlin/sessions/kotlin-compiler-5032612375677363917.salive b/build/kotlin/sessions/kotlin-compiler-12025959959237671804.salive similarity index 100% rename from build/kotlin/sessions/kotlin-compiler-5032612375677363917.salive rename to build/kotlin/sessions/kotlin-compiler-12025959959237671804.salive diff --git a/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/23x9mb0mh56g037ceedvelu3l/configuration-cache-report.html b/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/23x9mb0mh56g037ceedvelu3l/configuration-cache-report.html deleted file mode 100644 index fd5c32a9..00000000 --- a/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/23x9mb0mh56g037ceedvelu3l/configuration-cache-report.html +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/8d2lcn1m9leocrd407yfb85fs/configuration-cache-report.html b/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/8d2lcn1m9leocrd407yfb85fs/configuration-cache-report.html deleted file mode 100644 index 009641e1..00000000 --- a/build/reports/configuration-cache/18pk9cgzerkgo01rt92g1qh8t/8d2lcn1m9leocrd407yfb85fs/configuration-cache-report.html +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/build/reports/configuration-cache/4ih3hzlzjasp5wryip08opncx/2kcta2dpm6g51hwohuwayyvoz/configuration-cache-report.html b/build/reports/configuration-cache/4ih3hzlzjasp5wryip08opncx/2kcta2dpm6g51hwohuwayyvoz/configuration-cache-report.html deleted file mode 100644 index 3b42b3d7..00000000 --- a/build/reports/configuration-cache/4ih3hzlzjasp5wryip08opncx/2kcta2dpm6g51hwohuwayyvoz/configuration-cache-report.html +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/build/reports/configuration-cache/4x13hjewmsoppj44lxaaqupn3/7qjy0nhazr889t9ajimaisl34/configuration-cache-report.html b/build/reports/configuration-cache/4x13hjewmsoppj44lxaaqupn3/7qjy0nhazr889t9ajimaisl34/configuration-cache-report.html deleted file mode 100644 index 257e0263..00000000 --- a/build/reports/configuration-cache/4x13hjewmsoppj44lxaaqupn3/7qjy0nhazr889t9ajimaisl34/configuration-cache-report.html +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/service-telemetry/build.gradle b/service-telemetry/build.gradle index e75419e6..aa3ee4a7 100644 --- a/service-telemetry/build.gradle +++ b/service-telemetry/build.gradle @@ -26,7 +26,7 @@ android { kotlinOptions { jvmTarget = '1.8' } - namespace 'org.mozilla.telemet' + namespace 'org.mozilla.telemetry' } dependencies { @@ -34,4 +34,4 @@ dependencies { implementation "org.mozilla.components:support-base:100.0.20220327143103" implementation "org.mozilla.components:concept-fetch:100.0.20220327143103" testImplementation "org.mozilla.components:lib-fetch-httpurlconnection:100.0.20220327143103" -} +} \ No newline at end of file diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/Telemetry.java b/service-telemetry/src/main/java/org/mozilla/telemetry/Telemetry.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/Telemetry.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/Telemetry.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/TelemetryHolder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/TelemetryHolder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/TelemetryHolder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/TelemetryHolder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/config/TelemetryConfiguration.java b/service-telemetry/src/main/java/org/mozilla/telemetry/config/TelemetryConfiguration.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/config/TelemetryConfiguration.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/config/TelemetryConfiguration.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/event/TelemetryEvent.java b/service-telemetry/src/main/java/org/mozilla/telemetry/event/TelemetryEvent.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/event/TelemetryEvent.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/event/TelemetryEvent.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ArchMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ArchMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ArchMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ArchMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ClientIdMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ClientIdMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ClientIdMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ClientIdMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedDateMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedDateMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedDateMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedDateMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedDateMeasurementNew.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedDateMeasurementNew.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedDateMeasurementNew.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedDateMeasurementNew.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedTimestampMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedTimestampMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedTimestampMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedTimestampMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedTimestampMeasurementNew.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedTimestampMeasurementNew.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/CreatedTimestampMeasurementNew.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/CreatedTimestampMeasurementNew.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/DefaultSearchMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/DefaultSearchMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/DefaultSearchMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/DefaultSearchMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/DeviceMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/DeviceMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/DeviceMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/DeviceMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/EventsMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/EventsMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/EventsMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/EventsMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ExperimentsMapMeasurement.kt b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ExperimentsMapMeasurement.kt similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ExperimentsMapMeasurement.kt rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ExperimentsMapMeasurement.kt diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ExperimentsMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ExperimentsMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ExperimentsMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ExperimentsMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/FirstRunProfileDateMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/FirstRunProfileDateMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/FirstRunProfileDateMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/FirstRunProfileDateMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/LocaleMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/LocaleMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/LocaleMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/LocaleMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/MetricsMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/MetricsMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/MetricsMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/MetricsMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/OperatingSystemMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/OperatingSystemMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/OperatingSystemMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/OperatingSystemMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/OperatingSystemVersionMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/OperatingSystemVersionMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/OperatingSystemVersionMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/OperatingSystemVersionMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/PocketIdMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/PocketIdMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/PocketIdMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/PocketIdMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ProcessStartTimestampMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ProcessStartTimestampMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/ProcessStartTimestampMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/ProcessStartTimestampMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SearchesMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SearchesMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SearchesMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SearchesMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SequenceMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SequenceMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SequenceMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SequenceMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SessionCountMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SessionCountMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SessionCountMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SessionCountMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SessionDurationMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SessionDurationMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SessionDurationMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SessionDurationMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SettingsMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SettingsMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/SettingsMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/SettingsMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/StaticMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/StaticMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/StaticMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/StaticMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/TelemetryMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/TelemetryMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/TelemetryMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/TelemetryMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/TimezoneOffsetMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/TimezoneOffsetMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/TimezoneOffsetMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/TimezoneOffsetMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/VersionMeasurement.java b/service-telemetry/src/main/java/org/mozilla/telemetry/measurement/VersionMeasurement.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/measurement/VersionMeasurement.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/measurement/VersionMeasurement.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/net/TelemetryClient.kt b/service-telemetry/src/main/java/org/mozilla/telemetry/net/TelemetryClient.kt similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/net/TelemetryClient.kt rename to service-telemetry/src/main/java/org/mozilla/telemetry/net/TelemetryClient.kt diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryCorePingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryCorePingBuilder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryCorePingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryCorePingBuilder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryEventPingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryEventPingBuilder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryEventPingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryEventPingBuilder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryMobileEventPingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryMobileEventPingBuilder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryMobileEventPingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryMobileEventPingBuilder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryMobileMetricsPingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryMobileMetricsPingBuilder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryMobileMetricsPingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryMobileMetricsPingBuilder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPing.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPing.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPing.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPing.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPingBuilder.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPingBuilder.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPocketEventPingBuilder.java b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPocketEventPingBuilder.java similarity index 97% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPocketEventPingBuilder.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPocketEventPingBuilder.java index 8780c5d5..1eb2d6d0 100644 --- a/service-telemetry/src/main/java/org/mozilla/telemetrie/ping/TelemetryPocketEventPingBuilder.java +++ b/service-telemetry/src/main/java/org/mozilla/telemetry/ping/TelemetryPocketEventPingBuilder.java @@ -23,7 +23,7 @@ import org.mozilla.telemetry.measurement.TimezoneOffsetMeasurement; * https://github.com/mozilla-services/mozilla-pipeline-schemas/blob/dc458113a7a523e60a9ba50e1174a3b1e0cfdc24/schemas/pocket/fire-tv-events/fire-tv-events.1.schema.json */ public class TelemetryPocketEventPingBuilder extends TelemetryPingBuilder { - public static final String TYPE = "fuck-tv-events"; + public static final String TYPE = "fire-tv-events"; private static final int VERSION = 1; private EventsMeasurement eventsMeasurement; diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/TelemetryScheduler.java b/service-telemetry/src/main/java/org/mozilla/telemetry/schedule/TelemetryScheduler.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/TelemetryScheduler.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/schedule/TelemetryScheduler.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/jobscheduler/JobSchedulerTelemetryScheduler.java b/service-telemetry/src/main/java/org/mozilla/telemetry/schedule/jobscheduler/JobSchedulerTelemetryScheduler.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/jobscheduler/JobSchedulerTelemetryScheduler.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/schedule/jobscheduler/JobSchedulerTelemetryScheduler.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/jobscheduler/TelemetryJobService.java b/service-telemetry/src/main/java/org/mozilla/telemetry/schedule/jobscheduler/TelemetryJobService.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/schedule/jobscheduler/TelemetryJobService.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/schedule/jobscheduler/TelemetryJobService.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/serialize/JSONPingSerializer.java b/service-telemetry/src/main/java/org/mozilla/telemetry/serialize/JSONPingSerializer.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/serialize/JSONPingSerializer.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/serialize/JSONPingSerializer.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/serialize/TelemetryPingSerializer.java b/service-telemetry/src/main/java/org/mozilla/telemetry/serialize/TelemetryPingSerializer.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/serialize/TelemetryPingSerializer.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/serialize/TelemetryPingSerializer.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/storage/FileTelemetryStorage.java b/service-telemetry/src/main/java/org/mozilla/telemetry/storage/FileTelemetryStorage.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/storage/FileTelemetryStorage.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/storage/FileTelemetryStorage.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/storage/TelemetryStorage.java b/service-telemetry/src/main/java/org/mozilla/telemetry/storage/TelemetryStorage.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/storage/TelemetryStorage.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/storage/TelemetryStorage.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/util/ContextUtils.java b/service-telemetry/src/main/java/org/mozilla/telemetry/util/ContextUtils.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/util/ContextUtils.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/util/ContextUtils.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/util/FileUtils.java b/service-telemetry/src/main/java/org/mozilla/telemetry/util/FileUtils.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/util/FileUtils.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/util/FileUtils.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/util/IOUtils.java b/service-telemetry/src/main/java/org/mozilla/telemetry/util/IOUtils.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/util/IOUtils.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/util/IOUtils.java diff --git a/service-telemetry/src/main/java/org/mozilla/telemetrie/util/StringUtils.java b/service-telemetry/src/main/java/org/mozilla/telemetry/util/StringUtils.java similarity index 100% rename from service-telemetry/src/main/java/org/mozilla/telemetrie/util/StringUtils.java rename to service-telemetry/src/main/java/org/mozilla/telemetry/util/StringUtils.java