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

Fixed more bugs recently introduced. Hardened asynctasks against memory leaks. Fixed some other stuff

Browse Source
This commit is contained in:
Anthony Restaino 2015-10-15 20:24:04 -04:00
parent 88549bf156
commit 72ee377a35
6 changed files with 130 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
View File

@ -161,11 +161,12 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
private ValueCallback<Uri[]> mFilePathCallback;
// Primatives
private boolean mFullScreen, mColorMode, mDarkTheme,
mIsNewIntent = false,
mIsFullScreen = false,
mIsImmersive = false,
mShowTabsInDrawer;
private boolean mFullScreen;
private boolean mDarkTheme;
private boolean mIsNewIntent = false;
private boolean mIsFullScreen = false;
private boolean mIsImmersive = false;
private boolean mShowTabsInDrawer;
private int mOriginalOrientation, mBackgroundColor, mIdGenerator, mIconColor,
mCurrentUiColor = Color.BLACK;
private String mSearchText, mUntitledTitle, mHomepage, mCameraPhotoPath;
@ -405,7 +406,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
if (!hasFocus && currentView != null) {
setIsLoading(currentView.getProgress() < 100);
updateUrl(currentView.getUrl(), true);
} else if (hasFocus) {
} else if (hasFocus && currentView != null) {
String url = currentView.getUrl();
if (url.startsWith(Constants.FILE)) {
mSearch.setText("");
@ -559,11 +560,11 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
private void initializePreferences() {
final LightningView currentView = tabsManager.getCurrentTab();
final WebView currentWebView = currentView.getWebView();
final WebView currentWebView = tabsManager.getCurrentWebView();
mFullScreen = mPreferences.getFullScreenEnabled();
mColorMode = mPreferences.getColorModeEnabled();
mColorMode &= !mDarkTheme;
if (!isIncognito() && !mColorMode && !mDarkTheme && mWebpageBitmap != null) {
boolean colorMode = mPreferences.getColorModeEnabled();
colorMode &= !mDarkTheme;
if (!isIncognito() && !colorMode && !mDarkTheme && mWebpageBitmap != null) {
changeToolbarBackground(mWebpageBitmap, null);
} else if (!isIncognito() && currentView != null && !mDarkTheme
&& currentView.getFavicon() != null) {
@ -731,9 +732,11 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
findInPage();
return true;
case R.id.action_reading_mode:
Intent read = new Intent(this, ReadingActivity.class);
read.putExtra(Constants.LOAD_READING_URL, currentView.getUrl());
startActivity(read);
if (currentView != null) {
Intent read = new Intent(this, ReadingActivity.class);
read.putExtra(Constants.LOAD_READING_URL, currentView.getUrl());
startActivity(read);
}
return true;
default:
return super.onOptionsItemSelected(item);
@ -822,6 +825,9 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
final WebView currentWebView = currentView != null ? currentView.getWebView() : null;
final LightningView newView = tabsManager.switchToTab(position);
final WebView newWebView = newView != null ? newView.getWebView() : null;
if (newView == null || newWebView == null) {
return;
}
// Set the background color so the color mode color doesn't show through
mBrowserFrame.setBackgroundColor(mBackgroundColor);
@ -946,7 +952,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
}
}
synchronized boolean newTab(String url, boolean show) {
private synchronized boolean newTab(String url, boolean show) {
// Limit number of tabs for limited version of app
if (!Constants.FULL_VERSION && tabsManager.size() >= 10) {
Utils.showSnackbar(this, R.string.max_tabs);
@ -984,11 +990,8 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
return;
}
// What?
int current = tabsManager.positionOf(currentTab);
if (current < 0) {
return;
}
if (!tabToDelete.getUrl().startsWith(Constants.FILE) && !isIncognito()) {
mPreferences.setSavedUrl(tabToDelete.getUrl());
}
@ -1016,9 +1019,11 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
showTab(position - 1);
mEventBus.post(new BrowserEvents.TabsChanged());
} else {
tabsManager.deleteTab(position);
}
} else {
if (currentTab.getUrl().startsWith(Constants.FILE) || currentTab.getUrl().equals(mHomepage)) {
if (currentTab != null && (currentTab.getUrl().startsWith(Constants.FILE)
|| currentTab.getUrl().equals(mHomepage))) {
closeActivity();
} else {
tabsManager.deleteTab(position);
@ -1130,7 +1135,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
void saveOpenTabs() {
if (mPreferences.getRestoreLostTabsEnabled()) {
final String s = tabsManager.tabsString();
mPreferences.setMemoryUrl(s.toString());
mPreferences.setMemoryUrl(s);
}
}
@ -1192,8 +1197,8 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
}
String searchUrl = mSearchText + UrlUtils.QUERY_PLACE_HOLDER;
query = query.trim();
currentTab.stopLoading();
if (currentTab != null) {
currentTab.stopLoading();
loadUrlInCurrentView(UrlUtils.smartUrlFilter(query, true, searchUrl));
}
}
@ -1318,30 +1323,34 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
* previously searched URLs
*/
private void initializeSearchSuggestions(final AutoCompleteTextView getUrl) {
final LightningView currentTab = tabsManager.getCurrentTab();
getUrl.setThreshold(1);
getUrl.setDropDownWidth(-1);
getUrl.setDropDownAnchor(R.id.toolbar_layout);
getUrl.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
try {
String url;
url = ((TextView) arg1.findViewById(R.id.url)).getText().toString();
if (url.startsWith(BrowserActivity.this.getString(R.string.suggestion))) {
url = ((TextView) arg1.findViewById(R.id.title)).getText().toString();
} else {
getUrl.setText(url);
public void onItemClick(AdapterView<?> adapterView, View view, int pos, long l) {
String url = null;
CharSequence urlString = ((TextView) view.findViewById(R.id.url)).getText();
if (urlString != null) {
url = urlString.toString();
}
if (url == null || url.startsWith(BrowserActivity.this.getString(R.string.suggestion))) {
CharSequence searchString = ((TextView) view.findViewById(R.id.title)).getText();
if (searchString != null) {
url = searchString.toString();
}
searchTheWeb(url);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0);
if (currentTab != null) {
currentTab.requestFocus();
}
} catch (NullPointerException e) {
Log.e("Browser Error: ", "NullPointerException on item click");
}
if (url == null) {
return;
}
getUrl.setText(url);
searchTheWeb(url);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(getUrl.getWindowToken(), 0);
final LightningView currentTab = tabsManager.getCurrentTab();
if (currentTab != null) {
currentTab.requestFocus();
}
}
@ -1521,7 +1530,9 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mFullscreenContainer.addView(mCustomView, COVER_SCREEN_PARAMS);
decor.addView(mFullscreenContainer, COVER_SCREEN_PARAMS);
setFullscreen(true, true);
currentTab.setVisibility(View.GONE);
if (currentTab != null) {
currentTab.setVisibility(View.GONE);
}
if (view instanceof FrameLayout) {
if (((FrameLayout) view).getFocusedChild() instanceof VideoView) {
mVideoView = (VideoView) ((FrameLayout) view).getFocusedChild();
@ -1633,16 +1644,20 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
* the newly created WebView.
*/
@Override
public void onCreateWindow(Message resultMsg) {
public synchronized void onCreateWindow(Message resultMsg) {
if (resultMsg == null) {
return;
}
if (newTab("", true)) {
// TODO Review this
final WebView webView = tabsManager.getTabAtPosition(tabsManager.size() - 1).getWebView();
WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
transport.setWebView(webView);
resultMsg.sendToTarget();
LightningView newTab = tabsManager.getTabAtPosition(tabsManager.size() - 1);
if (newTab != null) {
final WebView webView = newTab.getWebView();
if (webView != null) {
WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
transport.setWebView(webView);
resultMsg.sendToTarget();
}
}
}
}
@ -1666,8 +1681,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
*/
@Override
public void hideActionBar() {
final LightningView currentTab = tabsManager.getCurrentTab();
final WebView currentWebView = currentTab.getWebView();
final WebView currentWebView = tabsManager.getCurrentWebView();
if (mFullScreen) {
if (mBrowserFrame.findViewById(R.id.toolbar_layout) == null) {
mUiLayout.removeView(mToolbarLayout);
@ -1675,21 +1689,21 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mToolbarLayout.bringToFront();
Log.d(Constants.TAG, "Move view to browser frame");
mToolbarLayout.setTranslationY(0);
currentWebView.setTranslationY(mToolbarLayout.getHeight());
if (currentWebView != null) {
currentWebView.setTranslationY(mToolbarLayout.getHeight());
}
}
if (mToolbarLayout == null || currentTab == null)
if (mToolbarLayout == null || currentWebView == null)
return;
final int height = mToolbarLayout.getHeight();
final WebView view = currentWebView;
if (mToolbarLayout.getTranslationY() > -0.01f) {
Animation show = new Animation() {
@Override
protected void applyTransformation(float interpolatedTime, Transformation t) {
float trans = (1.0f - interpolatedTime) * height;
mToolbarLayout.setTranslationY(trans - height);
if (view != null)
view.setTranslationY(trans);
currentWebView.setTranslationY(trans);
}
};
show.setDuration(250);
@ -1791,25 +1805,27 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
@Override
public void onClick(View v) {
final LightningView currentTab = tabsManager.getCurrentTab();
final WebView currentWebView = currentTab.getWebView();
if (currentTab == null) {
return;
}
switch (v.getId()) {
case R.id.arrow_button:
if (mSearch != null && mSearch.hasFocus()) {
currentTab.requestFocus();
} else if (mShowTabsInDrawer) {
mDrawerLayout.openDrawer(mDrawerLeft);
} else if (currentTab != null) {
} else {
currentTab.loadHomepage();
}
break;
case R.id.button_next:
currentWebView.findNext(false);
currentTab.findNext();
break;
case R.id.button_back:
currentWebView.findNext(true);
currentTab.findPrevious();
break;
case R.id.button_quit:
currentWebView.clearMatches();
currentTab.clearFindMatches();
mSearchBar.setVisibility(View.GONE);
break;
case R.id.action_reading:
@ -1963,7 +1979,6 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
@Subscribe
public void bookmarkChanged(final BookmarkEvents.BookmarkChanged event) {
final LightningView currentTab = tabsManager.getCurrentTab();
final WebView currentWebView = currentTab.getWebView();
if (currentTab != null && currentTab.getUrl().startsWith(Constants.FILE)
&& currentTab.getUrl().endsWith(Constants.BOOKMARKS_FILENAME)) {
currentTab.loadBookmarkpage();
@ -1981,7 +1996,6 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
@Subscribe
public void bookmarkDeleted(final BookmarkEvents.Deleted event) {
final LightningView currentTab = tabsManager.getCurrentTab();
final WebView currentWebView = currentTab.getWebView();
if (currentTab != null && currentTab.getUrl().startsWith(Constants.FILE)
&& currentTab.getUrl().endsWith(Constants.BOOKMARKS_FILENAME)) {
currentTab.loadBookmarkpage();

26
app/src/main/java/acr/browser/lightning/activity/ReadingActivity.java
View File

@ -21,6 +21,8 @@ import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
import java.lang.ref.WeakReference;
import acr.browser.lightning.R;
import acr.browser.lightning.app.BrowserApp;
import acr.browser.lightning.constant.Constants;
@ -39,6 +41,7 @@ public class ReadingActivity extends AppCompatActivity {
private PreferenceManager mPreferences;
private int mTextSize;
private ProgressDialog mProgressDialog;
private PageLoader mLoaderReference;
private static final float XXLARGE = 30.0f;
private static final float XLARGE = 26.0f;
@ -130,29 +133,33 @@ public class ReadingActivity extends AppCompatActivity {
}
if (getSupportActionBar() != null)
getSupportActionBar().setTitle(Utils.getDomainName(mUrl));
new PageLoader(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, mUrl);
mLoaderReference = new PageLoader(this);
mLoaderReference.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, mUrl);
return true;
}
private class PageLoader extends AsyncTask<String, Void, Void> {
private final Activity mActivity;
private final WeakReference<Activity> mActivityReference;
private String mTitleText;
private String mBodyText;
public PageLoader(Activity activity) {
mActivity = activity;
mActivityReference = new WeakReference<>(activity);
}
@Override
protected void onPreExecute() {
super.onPreExecute();
mProgressDialog = new ProgressDialog(mActivity);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
mProgressDialog.setCancelable(false);
mProgressDialog.setIndeterminate(true);
mProgressDialog.setMessage(mActivity.getString(R.string.loading));
mProgressDialog.show();
Activity activity = mActivityReference.get();
if (activity != null) {
mProgressDialog = new ProgressDialog(activity);
mProgressDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
mProgressDialog.setCancelable(false);
mProgressDialog.setIndeterminate(true);
mProgressDialog.setMessage(activity.getString(R.string.loading));
mProgressDialog.show();
}
}
@Override
@ -224,6 +231,7 @@ public class ReadingActivity extends AppCompatActivity {
mProgressDialog.dismiss();
mProgressDialog = null;
}
mLoaderReference.cancel(true);
super.onDestroy();
}

2
app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java
View File

@ -26,7 +26,7 @@ public class BookmarkLocalSync {
private final Context mContext;
public BookmarkLocalSync(Context context) {
public BookmarkLocalSync(@NonNull Context context) {
mContext = context;
}

30
app/src/main/java/acr/browser/lightning/fragment/BookmarkSettingsFragment.java
View File

@ -5,6 +5,7 @@ package acr.browser.lightning.fragment;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
import android.os.AsyncTask;
import android.os.Build;
@ -15,6 +16,7 @@ import android.preference.PreferenceFragment;
import android.support.v7.app.AlertDialog;
import java.io.File;
import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@ -45,9 +47,17 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE
};
private ImportBookmarksTask mImportTaskReference;
private static final File mPath = new File(Environment.getExternalStorageDirectory().toString());
private class ImportBookmarksTask extends AsyncTask<Void, Void, Integer> {
private WeakReference<Activity> mActivityReference;
public ImportBookmarksTask(Activity activity) {
mActivityReference = new WeakReference<>(activity);
}
@Override
protected Integer doInBackground(Void... params) {
List<HistoryItem> list = null;
@ -67,10 +77,11 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
@Override
protected void onPostExecute(Integer num) {
super.onPostExecute(num);
if (mActivity != null) {
Activity activity = mActivityReference.get();
if (activity != null) {
int number = num;
final String message = mActivity.getResources().getString(R.string.message_import);
Utils.showSnackbar(mActivity, number + " " + message);
final String message = activity.getResources().getString(R.string.message_import);
Utils.showSnackbar(activity, number + " " + message);
}
}
}
@ -96,6 +107,9 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
public void onDestroy() {
super.onDestroy();
mActivity = null;
if (mImportTaskReference != null) {
mImportTaskReference.cancel(false);
}
}
private void initPrefs() {
@ -124,9 +138,6 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
public boolean onPreferenceClick(Preference preference) {
switch (preference.getKey()) {
case SETTINGS_EXPORT:
// if (PermissionsManager.checkPermissions(getActivity(), REQUIRED_PERMISSIONS)) {
// mBookmarkManager.exportBookmarks(getActivity());
// }
PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(getActivity(), REQUIRED_PERMISSIONS,
new PermissionsManager.PermissionResult() {
@Override
@ -141,10 +152,6 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
});
return true;
case SETTINGS_IMPORT:
// if (PermissionsManager.checkPermissions(getActivity(), REQUIRED_PERMISSIONS)) {
// loadFileList(null);
// createDialog();
// }
PermissionsManager.getInstance().requestPermissionsIfNecessaryForResult(getActivity(), REQUIRED_PERMISSIONS,
new PermissionsManager.PermissionResult() {
@Override
@ -160,7 +167,8 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
});
return true;
case SETTINGS_IMPORT_BROWSER:
new ImportBookmarksTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
mImportTaskReference = new ImportBookmarksTask(getActivity());
mImportTaskReference.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
return true;
default:
return false;

2
app/src/main/java/acr/browser/lightning/object/SearchAdapter.java
View File

@ -414,7 +414,7 @@ public class SearchAdapter extends BaseAdapter implements Filterable {
return connectivity.getActiveNetworkInfo();
}
private List<HistoryItem> getFilteredList() {
private synchronized List<HistoryItem> getFilteredList() {
List<HistoryItem> list = new ArrayList<>(5);
synchronized (mBookmarks) {
synchronized (mHistory) {

20
app/src/main/java/acr/browser/lightning/view/LightningView.java
View File

@ -582,6 +582,24 @@ public class LightningView {
}
}
public synchronized void findNext() {
if (mWebView != null) {
mWebView.findNext(true);
}
}
public synchronized void findPrevious() {
if (mWebView != null) {
mWebView.findNext(false);
}
}
public synchronized void clearFindMatches() {
if (mWebView != null) {
mWebView.clearMatches();
}
}
/**
* Used by {@link LightningWebClient}
*
@ -646,7 +664,7 @@ public class LightningView {
}
@Nullable
public WebView getWebView() {
public synchronized WebView getWebView() {
return mWebView;
}