Browse Source

Formatting

master
Anthony Restaino 11 years ago
parent
commit
1e2908ccd6
  1. 4521
      src/acr/browser/lightning/BrowserActivity.java
  2. 1720
      src/acr/browser/lightning/LightningView.java
  3. 7
      src/acr/browser/lightning/ReplacingInputStream.java
  4. 37
      src/acr/browser/lightning/Utils.java

4521
src/acr/browser/lightning/BrowserActivity.java

File diff suppressed because it is too large Load Diff

1720
src/acr/browser/lightning/LightningView.java

File diff suppressed because it is too large Load Diff

7
src/acr/browser/lightning/ReplacingInputStream.java

@ -15,8 +15,7 @@ public class ReplacingInputStream extends FilterInputStream { @@ -15,8 +15,7 @@ public class ReplacingInputStream extends FilterInputStream {
final byte[] search, replacement;
protected ReplacingInputStream(InputStream in, byte[] search,
byte[] replacement) {
protected ReplacingInputStream(InputStream in, byte[] search, byte[] replacement) {
super(in);
this.search = search;
this.replacement = replacement;
@ -43,7 +42,6 @@ public class ReplacingInputStream extends FilterInputStream { @@ -43,7 +42,6 @@ public class ReplacingInputStream extends FilterInputStream {
}
}
@Override
public int read() throws IOException {
@ -69,7 +67,8 @@ public class ReplacingInputStream extends FilterInputStream { @@ -69,7 +67,8 @@ public class ReplacingInputStream extends FilterInputStream {
}
/**
* Returns false. REFilterInputStream does not support mark() and reset() methods.
* Returns false. REFilterInputStream does not support mark() and reset()
* methods.
*/
@Override
public boolean markSupported() {

37
src/acr/browser/lightning/Utils.java

@ -23,11 +23,11 @@ public final class Utils { @@ -23,11 +23,11 @@ public final class Utils {
private Utils() {
}
public static void downloadFile(final Activity activity, final String url, final String userAgent,
final String contentDisposition, final boolean privateBrowsing) {
String fileName = URLUtil.guessFileName(url, null,
null);
DownloadHandler.onDownloadStart(activity, url, userAgent, contentDisposition, null, privateBrowsing);
public static void downloadFile(final Activity activity, final String url,
final String userAgent, final String contentDisposition, final boolean privateBrowsing) {
String fileName = URLUtil.guessFileName(url, null, null);
DownloadHandler.onDownloadStart(activity, url, userAgent, contentDisposition, null,
privateBrowsing);
Log.i(Constants.TAG, "Downloading" + fileName);
}
@ -38,8 +38,7 @@ public final class Utils { @@ -38,8 +38,7 @@ public final class Utils {
return;
}
try {
BufferedReader readUrlRead = new BufferedReader(new FileReader(
bookUrl));
BufferedReader readUrlRead = new BufferedReader(new FileReader(bookUrl));
String u;
while ((u = readUrlRead.readLine()) != null) {
if (u.contentEquals(url)) {
@ -54,10 +53,8 @@ public final class Utils { @@ -54,10 +53,8 @@ public final class Utils {
} catch (NullPointerException ignored) {
}
try {
BufferedWriter bookWriter = new BufferedWriter(new FileWriter(book,
true));
BufferedWriter urlWriter = new BufferedWriter(new FileWriter(
bookUrl, true));
BufferedWriter bookWriter = new BufferedWriter(new FileWriter(book, true));
BufferedWriter urlWriter = new BufferedWriter(new FileWriter(bookUrl, true));
bookWriter.write(title);
urlWriter.write(url);
bookWriter.newLine();
@ -70,10 +67,10 @@ public final class Utils { @@ -70,10 +67,10 @@ public final class Utils {
}
}
public static Intent newEmailIntent(Context context, String address,
String subject, String body, String cc) {
public static Intent newEmailIntent(Context context, String address, String subject,
String body, String cc) {
Intent intent = new Intent(Intent.ACTION_SEND);
intent.putExtra(Intent.EXTRA_EMAIL, new String[]{address});
intent.putExtra(Intent.EXTRA_EMAIL, new String[] { address });
intent.putExtra(Intent.EXTRA_TEXT, body);
intent.putExtra(Intent.EXTRA_SUBJECT, subject);
intent.putExtra(Intent.EXTRA_CC, cc);
@ -81,11 +78,11 @@ public final class Utils { @@ -81,11 +78,11 @@ public final class Utils {
return intent;
}
public static void createInformativeDialog(Context context, String title,
String message) {
public static void createInformativeDialog(Context context, String title, String message) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(title);
builder.setMessage(message).setCancelable(true)
builder.setMessage(message)
.setCancelable(true)
.setPositiveButton(context.getResources().getString(R.string.action_ok),
new DialogInterface.OnClickListener() {
@Override
@ -124,15 +121,13 @@ public final class Utils { @@ -124,15 +121,13 @@ public final class Utils {
public static List<HistoryItem> getBookmarks(Context context) {
List<HistoryItem> bookmarks = new ArrayList<HistoryItem>();
File bookUrl = new File(context.getFilesDir(),
"bookurl");
File bookUrl = new File(context.getFilesDir(), "bookurl");
File book = new File(context.getFilesDir(), "bookmarks");
try {
BufferedReader readUrl = new BufferedReader(new FileReader(bookUrl));
BufferedReader readBook = new BufferedReader(new FileReader(book));
String u, t;
while ((u = readUrl.readLine()) != null
&& (t = readBook.readLine()) != null) {
while ((u = readUrl.readLine()) != null && (t = readBook.readLine()) != null) {
HistoryItem map = new HistoryItem(u, t, R.drawable.ic_bookmark);
bookmarks.add(map);
}

Loading…
Cancel
Save