fix settings action for data collection agreement

Author: jlucidar

app/src/main/java/com/fpvout/digiview/DataCollectionAgreementPopupActivity.java

@@ -1,20 +1,20 @@
 package com.fpvout.digiview;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceManager;
 
 public class DataCollectionAgreementPopupActivity extends AppCompatActivity {
     private SharedPreferences preferences;
     private AlertDialog.Builder builder;
 
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        preferences = this.getApplicationContext().getSharedPreferences("com.fpvout.digiview", Context.MODE_PRIVATE);
+        preferences = PreferenceManager.getDefaultSharedPreferences(this.getApplicationContext());
         builder = new AlertDialog.Builder(this);
         initializeUI();
     }

app/src/main/java/com/fpvout/digiview/MainActivity.java

@@ -373,7 +373,7 @@ protected void onDestroy() {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        SharedPreferences preferences = getApplicationContext().getSharedPreferences("com.fpvout.digiview", Context.MODE_PRIVATE);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean dataCollectionAccepted = preferences.getBoolean("dataCollectionAccepted", false);
 
         if (requestCode == 1) { // Data Collection agreement Activity
@@ -390,7 +390,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     } //onActivityResult
 
     private void checkDataCollectionAgreement() {
-        SharedPreferences preferences = getApplicationContext().getSharedPreferences("com.fpvout.digiview", Context.MODE_PRIVATE);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean dataCollectionAccepted = preferences.getBoolean("dataCollectionAccepted", false);
         boolean dataCollectionReplied = preferences.getBoolean("dataCollectionReplied", false);
         if (!dataCollectionReplied) {

app/src/main/res/xml/root_preferences.xml

@@ -17,7 +17,7 @@
     <PreferenceCategory app:title="@string/privacy">
 
         <SwitchPreferenceCompat
-            app:key="EnableAnalytics"
+            app:key="dataCollectionAccepted"
             app:title="@string/enable_analytics"
             app:defaultValue="true"
             app:summary="@string/data_collection_text" />