Revert "telemetrie and new icon"

This reverts commit 4f5adae21d.

app/orion/release/output-metadata.json

@@ -16,8 +16,8 @@
         }
       ],
       "attributes": [],
-      "versionCode": 581,
+      "versionCode": 580,
-      "versionName": "Build 1.6.1",
+      "versionName": "Build | Dark-Origin 1.1.0.12",
       "outputFile": "app-orion-x86_64-release.apk"
     },
     {
@@ -29,23 +29,10 @@
         }
       ],
       "attributes": [],
-      "versionCode": 581,
+      "versionCode": 580,
-      "versionName": "Build 1.6.1",
+      "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,
+      "versionCode": 580,
-      "versionName": "Build 1.6.1",
+      "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"

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" />
-<!--
+
         <activity
             android:name="com.hiddenservices.onionservices.appManager.settingManager.trackingManager.settingTrackingController"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
             android:windowSoftInputMode="adjustPan" />
- -->
+
         <activity
             android:name="com.hiddenservices.onionservices.appManager.homeManager.homeController.homeController"
             android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize|locale|layoutDirection|smallestScreenSize|screenLayout"
@@ -321,4 +321,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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"
     }
 }

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"
-}
+}

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;