r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Formatting

Browse Source
This commit is contained in:
Anthony Restaino 2014-07-28 17:09:03 -04:00
parent 1e2908ccd6
commit b94cdc40af
8 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/acr/browser/lightning/AdBlock.java
View File

@ -11,6 +11,7 @@ import java.io.InputStreamReader;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
public class AdBlock {
@ -25,19 +26,18 @@ public class AdBlock {
private boolean mBlockAds;
private static final Locale mLocale = Locale.getDefault();
public AdBlock(Context context) {
if (mBlockedDomainsList.isEmpty()) {
loadBlockedDomainsList(context);
}
mPreferences = context.getSharedPreferences(
PreferenceConstants.PREFERENCES, 0);
mBlockAds = mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS,
false);
mPreferences = context.getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
mBlockAds = mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS, false);
}
public void updatePreference() {
mBlockAds = mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS,
false);
mBlockAds = mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS, false);
}
private void loadBlockedDomainsList(final Context context) {
@ -47,15 +47,15 @@ public class AdBlock {
public void run() {
AssetManager asset = context.getAssets();
try {
BufferedReader reader = new BufferedReader(
new InputStreamReader(asset.open(BLOCKED_DOMAINS_LIST_FILE_NAME)));
BufferedReader reader = new BufferedReader(new InputStreamReader(
asset.open(BLOCKED_DOMAINS_LIST_FILE_NAME)));
String line;
while ((line = reader.readLine()) != null) {
mBlockedDomainsList.add(line.trim().toLowerCase());
mBlockedDomainsList.add(line.trim().toLowerCase(mLocale));
}
} catch (IOException e) {
Log.wtf(TAG, "Reading blocked domains list from file '" +
BLOCKED_DOMAINS_LIST_FILE_NAME + "' failed.", e);
Log.wtf(TAG, "Reading blocked domains list from file '"
+ BLOCKED_DOMAINS_LIST_FILE_NAME + "' failed.", e);
}
}
});
@ -75,7 +75,7 @@ public class AdBlock {
return false;
}
boolean isOnBlacklist = mBlockedDomainsList.contains(domain.toLowerCase());
boolean isOnBlacklist = mBlockedDomainsList.contains(domain.toLowerCase(mLocale));
if (isOnBlacklist) {
Log.d(TAG, "URL '" + url + "' is an ad");
}

18
src/acr/browser/lightning/AdvancedSettingsActivity.java
View File

@ -200,24 +200,30 @@ public class AdvancedSettingsActivity extends Activity {
R.string.stock_browser_available));
}
messageHandler = new MessageHandler();
messageHandler = new MessageHandler(mContext);
}
private class MessageHandler extends Handler {
private static class MessageHandler extends Handler {
Context mHandlerContext;
public MessageHandler(Context context){
this.mHandlerContext = context;
}
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
case 1:
Utils.showToast(
mContext,
mContext.getResources().getString(
mHandlerContext,
mHandlerContext.getResources().getString(
R.string.message_clear_history));
break;
case 2:
Utils.showToast(
mContext,
mContext.getResources().getString(
mHandlerContext,
mHandlerContext.getResources().getString(
R.string.message_cookies_cleared));
break;
}

23
src/acr/browser/lightning/DatabaseHandler.java
View File

@ -34,17 +34,15 @@ public class DatabaseHandler extends SQLiteOpenHelper {
public static SQLiteDatabase mDatabase;
public DatabaseHandler(Context context) {
super(context.getApplicationContext(), DATABASE_NAME, null,
DATABASE_VERSION);
super(context.getApplicationContext(), DATABASE_NAME, null, DATABASE_VERSION);
mDatabase = this.getWritableDatabase();
}
// Creating Tables
@Override
public void onCreate(SQLiteDatabase db) {
String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + "("
+ KEY_ID + " INTEGER PRIMARY KEY," + KEY_URL + " TEXT,"
+ KEY_TITLE + " TEXT" + ")";
String CREATE_HISTORY_TABLE = "CREATE TABLE " + TABLE_HISTORY + "(" + KEY_ID
+ " INTEGER PRIMARY KEY," + KEY_URL + " TEXT," + KEY_TITLE + " TEXT" + ")";
db.execSQL(CREATE_HISTORY_TABLE);
}
@ -96,9 +94,8 @@ public class DatabaseHandler extends SQLiteOpenHelper {
// Getting single item
String getHistoryItem(String url) {
Cursor cursor = mDatabase.query(TABLE_HISTORY, new String[]{KEY_ID, KEY_URL,
KEY_TITLE}, KEY_URL + "=?", new String[]{url}, null, null,
null, null);
Cursor cursor = mDatabase.query(TABLE_HISTORY, new String[] { KEY_ID, KEY_URL, KEY_TITLE },
KEY_URL + "=?", new String[] { url }, null, null, null, null);
String m = null;
if (cursor != null) {
cursor.moveToFirst();
@ -112,8 +109,9 @@ public class DatabaseHandler extends SQLiteOpenHelper {
public List<HistoryItem> findItemsContaining(String search) {
List<HistoryItem> itemList = new ArrayList<HistoryItem>();
//select query
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " WHERE " + KEY_TITLE + " LIKE '%" + search + "%'";
// select query
String selectQuery = "SELECT * FROM " + TABLE_HISTORY + " WHERE " + KEY_TITLE + " LIKE '%"
+ search + "%'";
Cursor cursor = mDatabase.rawQuery(selectQuery, null);
// looping through all rows and adding to list
@ -181,15 +179,14 @@ public class DatabaseHandler extends SQLiteOpenHelper {
values.put(KEY_URL, item.getUrl());
values.put(KEY_TITLE, item.getTitle());
int n = mDatabase.update(TABLE_HISTORY, values, KEY_ID + " = ?",
new String[]{String.valueOf(item.getId())});
new String[] { String.valueOf(item.getId()) });
// updating row
return n;
}
// Deleting single item
public synchronized void deleteHistoryItem(String id) {
mDatabase.delete(TABLE_HISTORY, KEY_ID + " = ?",
new String[]{String.valueOf(id)});
mDatabase.delete(TABLE_HISTORY, KEY_ID + " = ?", new String[] { String.valueOf(id) });
}
// Getting items Count

105
src/acr/browser/lightning/DownloadHandler.java
View File

@ -30,27 +30,31 @@ public class DownloadHandler {
private static Activity mActivity;
/**
* Notify the host application a download should be done, or that the data should be streamed if a streaming viewer
* is available.
*
* @param activity Activity requesting the download.
* @param url The full url to the content that should be downloaded
* @param userAgent User agent of the downloading application.
* @param contentDisposition Content-disposition http header, if present.
* @param mimetype The mimetype of the content reported by the server
* @param privateBrowsing If the request is coming from a private browsing tab.
* Notify the host application a download should be done, or that the data
* should be streamed if a streaming viewer is available.
*
* @param activity
* Activity requesting the download.
* @param url
* The full url to the content that should be downloaded
* @param userAgent
* User agent of the downloading application.
* @param contentDisposition
* Content-disposition http header, if present.
* @param mimetype
* The mimetype of the content reported by the server
* @param privateBrowsing
* If the request is coming from a private browsing tab.
*/
public static void onDownloadStart(Activity activity, String url,
String userAgent, String contentDisposition, String mimetype,
boolean privateBrowsing) {
public static void onDownloadStart(Activity activity, String url, String userAgent,
String contentDisposition, String mimetype, boolean privateBrowsing) {
mActivity = activity;
// if we're dealing wih A/V content that's not explicitly marked
// for download, check if it's streamable.
// for download, check if it's streamable.
if (contentDisposition == null
|| !contentDisposition.regionMatches(
true, 0, "attachment", 0, 10)) {
|| !contentDisposition.regionMatches(true, 0, "attachment", 0, 10)) {
// query the package manager to see if there's a registered handler
// that matches.
// that matches.
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setDataAndType(Uri.parse(url), mimetype);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@ -60,10 +64,8 @@ public class DownloadHandler {
ComponentName myName = activity.getComponentName();
// If we resolved to ourselves, we don't want to attempt to
// load the url only to try and download it again.
if (!myName.getPackageName().equals(
info.activityInfo.packageName)
|| !myName.getClassName().equals(
info.activityInfo.name)) {
if (!myName.getPackageName().equals(info.activityInfo.packageName)
|| !myName.getClassName().equals(info.activityInfo.name)) {
// someone (other than us) knows how to handle this mime
// type with this scheme, don't download.
try {
@ -76,8 +78,8 @@ public class DownloadHandler {
}
}
}
onDownloadStartNoStream(activity, url, userAgent, contentDisposition,
mimetype, privateBrowsing);
onDownloadStartNoStream(activity, url, userAgent, contentDisposition, mimetype,
privateBrowsing);
}
// This is to work around the fact that java.net.URI throws Exceptions
@ -111,23 +113,27 @@ public class DownloadHandler {
}
/**
* Notify the host application a download should be done, even if there is a streaming viewer available for thise
* type.
*
* @param activity Activity requesting the download.
* @param url The full url to the content that should be downloaded
* @param userAgent User agent of the downloading application.
* @param contentDisposition Content-disposition http header, if present.
* @param mimetype The mimetype of the content reported by the server
* @param privateBrowsing If the request is coming from a private browsing tab.
* Notify the host application a download should be done, even if there is a
* streaming viewer available for thise type.
*
* @param activity
* Activity requesting the download.
* @param url
* The full url to the content that should be downloaded
* @param userAgent
* User agent of the downloading application.
* @param contentDisposition
* Content-disposition http header, if present.
* @param mimetype
* The mimetype of the content reported by the server
* @param privateBrowsing
* If the request is coming from a private browsing tab.
*/
/*package */
static void onDownloadStartNoStream(Activity activity,
String url, String userAgent, String contentDisposition,
String mimetype, boolean privateBrowsing) {
/* package */
static void onDownloadStartNoStream(Activity activity, String url, String userAgent,
String contentDisposition, String mimetype, boolean privateBrowsing) {
String filename = URLUtil.guessFileName(url,
contentDisposition, mimetype);
String filename = URLUtil.guessFileName(url, contentDisposition, mimetype);
// Check to see if we have an SDCard
String status = Environment.getExternalStorageState();
@ -144,12 +150,9 @@ public class DownloadHandler {
title = R.string.download_no_sdcard_dlg_title;
}
new AlertDialog.Builder(activity)
.setTitle(title)
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(msg)
.setPositiveButton(R.string.action_ok, null)
.show();
new AlertDialog.Builder(activity).setTitle(title)
.setIcon(android.R.drawable.ic_dialog_alert).setMessage(msg)
.setPositiveButton(R.string.action_ok, null).show();
return;
}
@ -177,7 +180,8 @@ public class DownloadHandler {
}
request.setMimeType(mimetype);
// set downloaded file destination to /sdcard/Download.
// or, should it be set to one of several Environment.DIRECTORY* dirs depending on mimetype?
// or, should it be set to one of several Environment.DIRECTORY* dirs
// depending on mimetype?
String location = mActivity.getSharedPreferences(PreferenceConstants.PREFERENCES, 0)
.getString(PreferenceConstants.DOWNLOAD_DIRECTORY, Environment.DIRECTORY_DOWNLOADS);
@ -190,19 +194,17 @@ public class DownloadHandler {
// old percent-encoded url.
String cookies = CookieManager.getInstance().getCookie(url);
request.addRequestHeader("cookie", cookies);
request.setNotificationVisibility(
DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
if (mimetype == null) {
if (TextUtils.isEmpty(addressString)) {
return;
}
// We must have long pressed on a link or image to download it. We
// are not sure of the mimetype in this case, so do a head request
new FetchUrlMimeType(activity, request, addressString, cookies,
userAgent).start();
new FetchUrlMimeType(activity, request, addressString, cookies, userAgent).start();
} else {
final DownloadManager manager
= (DownloadManager) activity.getSystemService(Context.DOWNLOAD_SERVICE);
final DownloadManager manager = (DownloadManager) activity
.getSystemService(Context.DOWNLOAD_SERVICE);
new Thread("Browser download") {
@Override
public void run() {
@ -210,7 +212,6 @@ public class DownloadHandler {
}
}.start();
}
Toast.makeText(activity, R.string.download_pending, Toast.LENGTH_SHORT)
.show();
Toast.makeText(activity, R.string.download_pending, Toast.LENGTH_SHORT).show();
}
}

4
src/acr/browser/lightning/FetchUrlMimeType.java
View File

@ -100,8 +100,8 @@ public class FetchUrlMimeType extends Thread {
}
// Start the download
DownloadManager manager = (DownloadManager) mContext.getSystemService(
Context.DOWNLOAD_SERVICE);
DownloadManager manager = (DownloadManager) mContext
.getSystemService(Context.DOWNLOAD_SERVICE);
manager.enqueue(mRequest);
}
}

13
src/acr/browser/lightning/IncognitoActivity.java
View File

@ -22,8 +22,7 @@ public class IncognitoActivity extends BrowserActivity {
@Override
public void updateCookiePreference() {
if (mPreferences == null) {
mPreferences = getSharedPreferences(
PreferenceConstants.PREFERENCES, 0);
mPreferences = getSharedPreferences(PreferenceConstants.PREFERENCES, 0);
}
mCookieManager = CookieManager.getInstance();
CookieSyncManager.createInstance(this);
@ -35,9 +34,9 @@ public class IncognitoActivity extends BrowserActivity {
@Override
public synchronized void initializeTabs() {
super.initializeTabs();
//restoreOrNewTab();
// restoreOrNewTab();
newTab(null, true);
//if incognito mode use newTab(null, true); instead
// if incognito mode use newTab(null, true); instead
}
@Override
@ -48,20 +47,20 @@ public class IncognitoActivity extends BrowserActivity {
@Override
protected void onNewIntent(Intent intent) {
//handleNewIntent(intent);
// handleNewIntent(intent);
super.onNewIntent(intent);
}
@Override
protected void onPause() {
super.onPause();
//saveOpenTabs();
// saveOpenTabs();
}
@Override
public void updateHistory(String title, String url) {
super.updateHistory(title, url);
//addItemToHistory(title, url);
// addItemToHistory(title, url);
}
@Override

3
src/acr/browser/lightning/IntentUtils.java
View File

@ -94,8 +94,7 @@ public class IntentUtils {
// to launch a new intent for every URL, using OR only
// launches a new one if there is a non-browser app that
// can handle it.
if (filter.countDataAuthorities() == 0
|| filter.countDataPaths() == 0) {
if (filter.countDataAuthorities() == 0 || filter.countDataPaths() == 0) {
// Generic handler, skip
continue;
}

3
src/acr/browser/lightning/LicenseActivity.java
View File

@ -44,8 +44,7 @@ public class LicenseActivity extends Activity implements View.OnClickListener {
}
private void actionView(String url) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url), this,
MainActivity.class));
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url), this, MainActivity.class));
finish();
}