move survey domain and display it only after some time

0xpr03 · 0xpr03 · commit a2035236db8a · 2022-04-30T21:10:40.000+02:00
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/MainActivity.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/activity/MainActivity.java
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
             if (savedInstanceState != null) {
                 surveyDialog = (SurveyDialog) getSupportFragmentManager().getFragment(savedInstanceState, SurveyDialog.TAG);
             }
-            if (surveyDialog == null && !SurveyDialog.wasSurveyDisplayed(this)) {
+            if (surveyDialog == null && SurveyDialog.shouldDisplaySurvey(this)) {
                 surveyDialog = SurveyDialog.newInstance();
                 surveyDialog.show(getSupportFragmentManager(), SurveyDialog.TAG);
             }
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/SurveyDialog.java b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/dialog/SurveyDialog.java
@@ -32,6 +32,7 @@
 public class SurveyDialog extends DialogFragment {
     public static final String TAG = "SurveyDialog";
     private static final String P_KEY_SURVEY_DIALOG_API= "showedAPISurveyDialog";
+    private static final String P_KEY_SURVEY_DIALOG_API_COUNTER= "APISurveyCounter";
     private ProgressBar progressBar;
     private Button btnCancel;
     private Button btnAccept;
@@ -79,9 +80,17 @@ public void onResume() {
         this.setCancelable(false);
     }
 
-    public static boolean wasSurveyDisplayed(Context context) {
+    public static boolean shouldDisplaySurvey(Context context) {
         SharedPreferences settings = context.getSharedPreferences(PREFS_NAME, 0);
-        return settings.getBoolean(P_KEY_SURVEY_DIALOG_API,false);
+        if (settings.getBoolean(P_KEY_SURVEY_DIALOG_API,false)) {
+            return false;
+        }
+        // wait 10 times till displaying the dialog
+        int count = settings.getInt(P_KEY_SURVEY_DIALOG_API_COUNTER,10);
+        if(count > 0) {
+            settings.edit().putInt(P_KEY_SURVEY_DIALOG_API_COUNTER,count -1).apply();
+        }
+        return count == 0;
     }
 
     /**
diff --git a/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/SurveyViewModel.kt b/app/src/main/java/vocabletrainer/heinecke/aron/vocabletrainer/lib/ViewModel/SurveyViewModel.kt
@@ -38,7 +38,7 @@ class SurveyViewModel : ViewModel() {
         } else {
             // allow tls 1.0
             // can't be tested fully due to different device libraries
-            "https://vct.proctet.net/data/add/api"
+            "https://stats.vocabletrainer.de/data/add/api"
         }
         runner = Thread {
             val jsonBody: JSONObject
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -123,7 +123,7 @@
     <string name="Format_Diag_error_Title">Invalid Input</string>
 
     <string name="Survey_Diag_Title">Android Version Survey</string>
-    <string name="Survey_Diag_Msg" ><html>I\'d like to do a survey about the Android versions on which VAT is running.\nSupporting Android devices pre-v21 has gotten increasingly difficult.\nIf you take part the following Information will be send to <a href="https://vct.proctet.net">https://vct.proctet.net</a> and stored:\n<ul><li>Your Android version</li></ul>\nNothing else will be send, no IP is stored.\nYou can also see the results at above URL.</html></string>
+    <string name="Survey_Diag_Msg" ><html>I\'d like to do a survey about the Android versions on which VAT is running.\nIf you take part the following Information will be send to <a href="https://stats.vocabletrainer.de">https://stats.vocabletrainer.de</a> and stored:\n<ul><li>Your Android version</li></ul>\nNothing else will be send, no IP is stored.\nYou can also see the results at above URL.</html></string>
     <string name="Survey_Diag_Accept">Accept Survey</string>
     <string name="Survey_Diag_Decline">Decline</string>
     <string name="Survey_Diag_Error_Toast">Error during survey submit!</string>

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`54`	`54`	`if (savedInstanceState != null) {`
`55`	`55`	`surveyDialog = (SurveyDialog) getSupportFragmentManager().getFragment(savedInstanceState, SurveyDialog.TAG);`
`56`	`56`	`}`
`57`		`- if (surveyDialog == null && !SurveyDialog.wasSurveyDisplayed(this)) {`
	`57`	`+ if (surveyDialog == null && SurveyDialog.shouldDisplaySurvey(this)) {`
`58`	`58`	`surveyDialog = SurveyDialog.newInstance();`
`59`	`59`	`surveyDialog.show(getSupportFragmentManager(), SurveyDialog.TAG);`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class SurveyViewModel : ViewModel() {`
`38`	`38`	`} else {`
`39`	`39`	`// allow tls 1.0`
`40`	`40`	`// can't be tested fully due to different device libraries`
`41`		`- "https://vct.proctet.net/data/add/api"`
	`41`	`+ "https://stats.vocabletrainer.de/data/add/api"`
`42`	`42`	`}`
`43`	`43`	`runner = Thread {`
`44`	`44`	`val jsonBody: JSONObject`