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

Fixing crashes resulting from fragment lifecycle mismanagement

Browse Source
This commit is contained in:
anthony restaino 2017-06-05 08:22:05 -04:00
parent 5f222e2d5b
commit c8a2fd8262
3 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.Application;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
@ -61,6 +62,8 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
@Nullable private Activity mActivity; @Nullable private Activity mActivity;
@Inject BookmarkModel mBookmarkManager; @Inject BookmarkModel mBookmarkManager;
@Inject Application mApplication;
private File[] mFileList; private File[] mFileList;
private String[] mFileNameList; private String[] mFileNameList;
@Nullable private BookmarkLocalSync mSync; @Nullable private BookmarkLocalSync mSync;
@ -454,7 +457,12 @@ public class BookmarkSettingsFragment extends PreferenceFragment implements Pref
@Override @Override
public void onError(@NonNull Throwable throwable) { public void onError(@NonNull Throwable throwable) {
Log.e(TAG, "onError: importing bookmarks", throwable); Log.e(TAG, "onError: importing bookmarks", throwable);
Utils.createInformativeDialog(getActivity(), R.string.title_error, R.string.import_bookmark_error); Activity activity = getActivity();
if (activity != null) {
Utils.createInformativeDialog(activity, R.string.title_error, R.string.import_bookmark_error);
} else {
Utils.showToast(mApplication, R.string.import_bookmark_error);
}
} }
}); });
} }

6
app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
View File

@ -233,12 +233,16 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
@Override @Override
public void onItem(@Nullable Boolean item) { public void onItem(@Nullable Boolean item) {
Preconditions.checkNonNull(item); Preconditions.checkNonNull(item);
Activity activity = getActivity();
if (mBookmarkImage == null || activity == null) {
return;
}
if (!item) { if (!item) {
mBookmarkImage.setImageResource(R.drawable.ic_action_star); mBookmarkImage.setImageResource(R.drawable.ic_action_star);
mBookmarkImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN); mBookmarkImage.setColorFilter(mIconColor, PorterDuff.Mode.SRC_IN);
} else { } else {
mBookmarkImage.setImageResource(R.drawable.ic_bookmark); mBookmarkImage.setImageResource(R.drawable.ic_bookmark);
mBookmarkImage.setColorFilter(ThemeUtils.getAccentColor(getContext()), PorterDuff.Mode.SRC_IN); mBookmarkImage.setColorFilter(ThemeUtils.getAccentColor(activity), PorterDuff.Mode.SRC_IN);
} }
} }
}); });

13
app/src/main/java/acr/browser/lightning/utils/Utils.java
View File

@ -34,6 +34,7 @@ import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.webkit.URLUtil; import android.webkit.URLUtil;
import android.widget.Toast;
import com.anthonycr.grant.PermissionsManager; import com.anthonycr.grant.PermissionsManager;
import com.anthonycr.grant.PermissionsResultAction; import com.anthonycr.grant.PermissionsResultAction;
@ -175,6 +176,18 @@ public final class Utils {
Snackbar.make(view, message, Snackbar.LENGTH_SHORT).show(); Snackbar.make(view, message, Snackbar.LENGTH_SHORT).show();
} }
/**
* Shows a toast to the user.
* Should only be used if an activity is
* not available to show a snackbar.
*
* @param context the context needed to show the toast.
* @param resource the string shown by the toast to the user.
*/
public static void showToast(@NonNull Context context, @StringRes int resource) {
Toast.makeText(context, resource, Toast.LENGTH_SHORT).show();
}
/** /**
* Converts Density Pixels (DP) to Pixels (PX). * Converts Density Pixels (DP) to Pixels (PX).
* *