Fix setting freeform mode preference on first launch

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
index a08e117..9e7b9d0 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
@@ -15,7 +15,6 @@
 
 package com.farmerbb.taskbar.fragment;
 
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.support.v7.app.ActionBar;
@@ -35,14 +34,6 @@ public class FreeformModeFragment extends SettingsFragment {
         // Add preferences
         addPreferencesFromResource(R.xml.pref_freeform_hack);
 
-        SharedPreferences pref = U.getSharedPreferences(getActivity());
-        if(!pref.getBoolean("freeform_hack_override", false)) {
-            pref.edit()
-                    .putBoolean("freeform_hack", hasFreeformSupport())
-                    .putBoolean("freeform_hack_override", true)
-                    .apply();
-        }
-
         findPreference("freeform_hack").setOnPreferenceClickListener(this);
         findPreference("freeform_mode_help").setOnPreferenceClickListener(this);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
index 806cee3..00381ca 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
@@ -98,6 +98,15 @@ public class SettingsFragment extends PreferenceFragment implements OnPreference
                 && pref.getString("start_menu_layout", "null").equals("null")) {
             pref.edit().putString("start_menu_layout", "grid").apply();
         }
+
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            if(!pref.getBoolean("freeform_hack_override", false)) {
+                pref.edit()
+                        .putBoolean("freeform_hack", hasFreeformSupport())
+                        .putBoolean("freeform_hack_override", true)
+                        .apply();
+            }
+        }
     }
 
     private Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {