| OLD | NEW |
| 1 /* This Source Code Form is subject to the terms of the Mozilla Public | 1 /* This Source Code Form is subject to the terms of the Mozilla Public |
| 2 * License, v. 2.0. If a copy of the MPL was not distributed with this file, | 2 * License, v. 2.0. If a copy of the MPL was not distributed with this file, |
| 3 * You can obtain one at http://mozilla.org/MPL/2.0/. */ | 3 * You can obtain one at http://mozilla.org/MPL/2.0/. */ |
| 4 | 4 |
| 5 package org.mozilla.gecko; | 5 package org.mozilla.gecko; |
| 6 | 6 |
| 7 import org.mozilla.gecko.db.BrowserContract; | 7 import org.mozilla.gecko.db.BrowserContract; |
| 8 import org.mozilla.gecko.db.BrowserDB; | 8 import org.mozilla.gecko.db.BrowserDB; |
| 9 import org.mozilla.gecko.db.LocalBrowserDB; | 9 import org.mozilla.gecko.db.LocalBrowserDB; |
| 10 import org.mozilla.gecko.home.HomePanelsManager; | 10 import org.mozilla.gecko.home.HomePanelsManager; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 GeckoProfile.setBrowserDBFactory(new BrowserDB.Factory() { | 145 GeckoProfile.setBrowserDBFactory(new BrowserDB.Factory() { |
| 146 @Override | 146 @Override |
| 147 public BrowserDB get(String profileName, File profileDir) { | 147 public BrowserDB get(String profileName, File profileDir) { |
| 148 // Note that we don't use the profile directory -- we | 148 // Note that we don't use the profile directory -- we |
| 149 // send operations to the ContentProvider, which does | 149 // send operations to the ContentProvider, which does |
| 150 // its own thing. | 150 // its own thing. |
| 151 return new LocalBrowserDB(profileName); | 151 return new LocalBrowserDB(profileName); |
| 152 } | 152 } |
| 153 }); | 153 }); |
| 154 | 154 |
| 155 // Added AddOnBridge initialisation here for syncing requests that might
not have been saved by filter storage |
| 156 // See https://issues.adblockplus.org/ticket/2853 |
| 157 org.adblockplus.browser.AddOnBridge.init(context); |
| 158 |
| 155 super.onCreate(); | 159 super.onCreate(); |
| 156 } | 160 } |
| 157 | 161 |
| 158 public boolean isApplicationInBackground() { | 162 public boolean isApplicationInBackground() { |
| 159 return mInBackground; | 163 return mInBackground; |
| 160 } | 164 } |
| 161 | 165 |
| 162 public LightweightTheme getLightweightTheme() { | 166 public LightweightTheme getLightweightTheme() { |
| 163 return mLightweightTheme; | 167 return mLightweightTheme; |
| 164 } | 168 } |
| 165 | 169 |
| 166 public void prepareLightweightTheme() { | 170 public void prepareLightweightTheme() { |
| 167 mLightweightTheme = new LightweightTheme(this); | 171 mLightweightTheme = new LightweightTheme(this); |
| 168 } | 172 } |
| 169 } | 173 } |
| OLD | NEW |