|
|
@ -547,7 +547,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
try { |
|
|
|
try { |
|
|
|
String host = mPreferences.getProxyHost(); |
|
|
|
String host = mPreferences.getProxyHost(); |
|
|
|
int port = mPreferences.getProxyPort(); |
|
|
|
int port = mPreferences.getProxyPort(); |
|
|
|
WebkitProxy.setProxy(this.getPackageName() + ".BrowserApp", getApplicationContext(), |
|
|
|
WebkitProxy.setProxy(BrowserApp.class.getName(), getApplicationContext(), |
|
|
|
host, port); |
|
|
|
host, port); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
Log.d(Constants.TAG, "error enabling web proxying", e); |
|
|
|
Log.d(Constants.TAG, "error enabling web proxying", e); |
|
|
@ -710,7 +710,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
initializeTor(); |
|
|
|
initializeTor(); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
try { |
|
|
|
try { |
|
|
|
WebkitProxy.resetProxy(mActivity.getPackageName() + ".BrowserApp", |
|
|
|
WebkitProxy.resetProxy(BrowserApp.class.getName(), |
|
|
|
getApplicationContext()); |
|
|
|
getApplicationContext()); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
e.printStackTrace(); |
|
|
@ -1010,7 +1010,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
/** |
|
|
|
/** |
|
|
|
* Takes in the id of which bookmark was selected and shows a dialog that |
|
|
|
* Takes in the id of which bookmark was selected and shows a dialog that |
|
|
|
* allows the user to rename and change the url of the bookmark |
|
|
|
* allows the user to rename and change the url of the bookmark |
|
|
|
* |
|
|
|
* |
|
|
|
* @param id |
|
|
|
* @param id |
|
|
|
* which id in the list was chosen |
|
|
|
* which id in the list was chosen |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -1054,7 +1054,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
/** |
|
|
|
/** |
|
|
|
* displays the WebView contained in the LightningView Also handles the |
|
|
|
* displays the WebView contained in the LightningView Also handles the |
|
|
|
* removal of previous views |
|
|
|
* removal of previous views |
|
|
|
* |
|
|
|
* |
|
|
|
* @param view |
|
|
|
* @param view |
|
|
|
* the LightningView to show |
|
|
|
* the LightningView to show |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -2196,7 +2196,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* turns on fullscreen mode in the app |
|
|
|
* turns on fullscreen mode in the app |
|
|
|
* |
|
|
|
* |
|
|
|
* @param enabled |
|
|
|
* @param enabled |
|
|
|
* whether to enable fullscreen or not |
|
|
|
* whether to enable fullscreen or not |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -2373,7 +2373,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
/** |
|
|
|
/** |
|
|
|
* handles a long click on the page, parameter String url |
|
|
|
* handles a long click on the page, parameter String url |
|
|
|
* is the url that should have been obtained from the WebView touch node |
|
|
|
* is the url that should have been obtained from the WebView touch node |
|
|
|
* thingy, if it is null, this method tries to deal with it and find a workaround |
|
|
|
* thingy, if it is null, this method tries to deal with it and find a workaround |
|
|
|
*/ |
|
|
|
*/ |
|
|
@ -2586,7 +2586,7 @@ public class BrowserActivity extends ThemableActivity implements BrowserControll |
|
|
|
/** |
|
|
|
/** |
|
|
|
* handle presses on the refresh icon in the search bar, if the page is |
|
|
|
* handle presses on the refresh icon in the search bar, if the page is |
|
|
|
* loading, stop the page, if it is done loading refresh the page. |
|
|
|
* loading, stop the page, if it is done loading refresh the page. |
|
|
|
* |
|
|
|
* |
|
|
|
* See setIsFinishedLoading and setIsLoading for displaying the correct icon |
|
|
|
* See setIsFinishedLoading and setIsLoading for displaying the correct icon |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void refreshOrStop() { |
|
|
|
public void refreshOrStop() { |
|
|
|