From 383b88ded0301e0df814e3976d3b085224c012eb Mon Sep 17 00:00:00 2001
From: Todd Blose <todd@lana.io>
Date: Tue, 29 Mar 2016 13:12:17 -0700
Subject: [PATCH] clear user preferences in main activity onCreate

---
 .../org/getlantern/lantern/activity/LanternMainActivity.java  | 4 ++++
 .../app/src/main/java/org/getlantern/lantern/model/UI.java    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/activity/LanternMainActivity.java b/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/activity/LanternMainActivity.java
index 9e002a61a8..f743d2e23a 100644
--- a/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/activity/LanternMainActivity.java
+++ b/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/activity/LanternMainActivity.java
@@ -61,6 +61,10 @@ protected void onCreate(Bundle savedInstanceState) {
         mPrefs = Utils.getSharedPrefs(context);
 
         LanternUI = new UI(this, mPrefs);
+        // since onCreate is only called when the main activity
+        // is first created, we clear shared preferences in case
+        // Lantern was forcibly stopped during a previous run
+        LanternUI.clearPreferences();
 
         // the ACTION_SHUTDOWN intent is broadcast when the phone is
         // about to be shutdown. We register a receiver to make sure we
diff --git a/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/model/UI.java b/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/model/UI.java
index d0d6be7c36..f0445cb4c4 100644
--- a/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/model/UI.java
+++ b/src/github.com/getlantern/lantern-mobile/app/src/main/java/org/getlantern/lantern/model/UI.java
@@ -396,6 +396,10 @@ public boolean useVpn() {
         return mPrefs.getBoolean(LanternConfig.PREF_USE_VPN, false);
     }
 
+    public void clearPreferences() {
+        mPrefs.edit().putBoolean(LanternConfig.PREF_USE_VPN, false).commit();
+    }
+
     // update START/STOP power Lantern button
     // according to our stored preference
     public void setBtnStatus() {