From 38f73859d3fb467d7d0ca07d7f673e56b23d4343 Mon Sep 17 00:00:00 2001
From: GaidamakUA <jmazurevich@gmail.com>
Date: Thu, 22 Oct 2015 11:02:22 +0300
Subject: [PATCH] First time reset setting in Developement plugin

---
 .../src/net/osmand/plus/AppInitializer.java   | 28 ++++++++++++-------
 .../src/net/osmand/plus/OsmandSettings.java   |  4 +++
 .../SettingsDevelopmentActivity.java          | 15 ++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java
index 521c13ccf8..c14d4fe171 100644
--- a/OsmAnd/src/net/osmand/plus/AppInitializer.java
+++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java
@@ -56,9 +56,7 @@ import btools.routingapp.BRouterServiceConnection;
 public class AppInitializer implements IProgress {
 
 	public static final boolean TIPS_AND_TRICKS = false;
-	private static final String FIRST_TIME_APP_RUN = "FIRST_TIME_APP_RUN"; //$NON-NLS-1$
 	private static final String VECTOR_INDEXES_CHECK = "VECTOR_INDEXES_CHECK"; //$NON-NLS-1$
-	private static final String VERSION_INSTALLED = "VERSION_INSTALLED"; //$NON-NLS-1$
 	private static final String EXCEPTION_FILE_SIZE = "EXCEPTION_FS"; //$NON-NLS-1$
 
 	public static final String LATEST_CHANGES_URL = "changes-2.1.html";
@@ -111,13 +109,13 @@ public class AppInitializer implements IProgress {
 		if(initSettings) {
 			return;
 		}
-		SharedPreferences pref = activity.getPreferences(Context.MODE_WORLD_WRITEABLE);
-		if (!pref.contains(FIRST_TIME_APP_RUN)) {
-			firstTime = true;
-			pref.edit().putBoolean(FIRST_TIME_APP_RUN, true).commit();
-			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
-		} else if (!Version.getFullVersion(app).equals(pref.getString(VERSION_INSTALLED, ""))) {
-			pref.edit().putString(VERSION_INSTALLED, Version.getFullVersion(app)).commit();
+		OsmandSettings settings = getSettings(activity);
+		firstTime = settings.FIRST_TIME_APP_RUN.get();
+		if (firstTime) {
+			settings.FIRST_TIME_APP_RUN.set(false);
+			settings.VERSION_INSTALLED.set(Version.getFullVersion(app));
+		} else if (!Version.getFullVersion(app).equals(settings.VERSION_INSTALLED.get())) {
+			settings.VERSION_INSTALLED.set(Version.getFullVersion(app));
 			appVersionChanged = true;
 		}
 		initSettings = true;
@@ -131,7 +129,17 @@ public class AppInitializer implements IProgress {
 	public void setFirstTime(boolean firstTime) {
 		this.firstTime = firstTime;
 	}
-	
+
+	public void writeFirstTime(boolean firstTime, Activity activity) {
+		setFirstTime(firstTime);
+		OsmandSettings settings = getSettings(activity);
+		settings.FIRST_TIME_APP_RUN.set(firstTime);
+	}
+
+	private OsmandSettings getSettings(Activity activity) {
+		return ((OsmandApplication) activity.getApplication()).getSettings();
+	}
+
 	public boolean checkAppVersionChanged(Activity activity) {
 		initUiVars(activity);
 		boolean showRecentChangesDialog = !firstTime && appVersionChanged;
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index caa71822c6..5b3e884233 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1891,6 +1891,10 @@ public class OsmandSettings {
                     DashRateUsFragment.RateUsState.INITIAL_STATE, DashRateUsFragment.RateUsState.values())
                     .makeGlobal()
                     .cache();
+	public final OsmandPreference<Boolean> FIRST_TIME_APP_RUN =
+			new BooleanPreference("first_time_app_run", true).makeGlobal().cache();
+	public final OsmandPreference<String> VERSION_INSTALLED =
+			new StringPreference("version_installed", null).makeGlobal().cache();
 
 	
 	public enum DayNightMode {
diff --git a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
index c96c8f2f6f..9662fb80df 100644
--- a/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
@@ -182,6 +182,21 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
 		cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
 				R.string.show_free_version_banner,
 				R.string.show_free_version_banner_description));
+		final Preference firstRunPreference = new Preference(this);
+		firstRunPreference.setTitle("Reset first run");
+		firstRunPreference.setSummary("After reset app wold act like it is it's firs run");
+		firstRunPreference.setSelectable(true);
+		firstRunPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+			@Override
+			public boolean onPreferenceClick(Preference preference) {
+				final SettingsDevelopmentActivity activity = SettingsDevelopmentActivity.this;
+				activity.getMyApplication().getAppInitializer()
+						.writeFirstTime(true, activity);
+				firstRunPreference.setSummary("First run flag has been reset");
+				return true;
+			}
+		});
+		cat.addPreference(firstRunPreference);
 	}
 	
 	protected void availableProfileDialog() {