Skip to content

Fix potential NPEs and synchronization errors. #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2017
Merged

Fix potential NPEs and synchronization errors. #838

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions library/src/main/java/com/sothree/slidinguppanel/SlidingUpPanelLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.v4.app.BundleCompat;
import android.support.v4.view.MotionEventCompat;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
Expand Down Expand Up @@ -216,7 +212,7 @@ public enum PanelState {
private float mInitialMotionY;
private boolean mIsScrollableViewHandlingTouch = false;

private List<PanelSlideListener> mPanelSlideListeners = new CopyOnWriteArrayList<>();
private final List<PanelSlideListener> mPanelSlideListeners = new CopyOnWriteArrayList<>();
private View.OnClickListener mFadeOnClickListener;

private final ViewDragHelper mDragHelper;
Expand Down Expand Up @@ -288,9 +284,9 @@ public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
if (defAttrs != null) {
int gravity = defAttrs.getInt(0, Gravity.NO_GRAVITY);
setGravity(gravity);
defAttrs.recycle();
}

defAttrs.recycle();

TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.SlidingUpPanelLayout);

Expand All @@ -316,9 +312,8 @@ public SlidingUpPanelLayout(Context context, AttributeSet attrs, int defStyle) {
if (interpolatorResId != -1) {
scrollerInterpolator = AnimationUtils.loadInterpolator(context, interpolatorResId);
}
ta.recycle();
}

ta.recycle();
}

final float density = context.getResources().getDisplayMetrics().density;
Expand Down Expand Up @@ -520,6 +515,7 @@ public void removePanelSlideListener(PanelSlideListener listener) {
* Provides an on click for the portion of the main view that is dimmed. The listener is not
* triggered if the panel is in a collapsed or a hidden position. If the on click listener is
* not provided, the clicks on the dimmed area are passed through to the main layout.
*
* @param listener
*/
public void setFadeOnClickListener(View.OnClickListener listener) {
Expand Down Expand Up @@ -581,6 +577,7 @@ public void setScrollableView(View scrollableView) {

/**
* Sets the current scrollable view helper. See ScrollableViewHelper description for details.
*
* @param helper
*/
public void setScrollableViewHelper(ScrollableViewHelper helper) {
Expand Down Expand Up @@ -1325,7 +1322,7 @@ public Parcelable onSaveInstanceState() {

@Override
public void onRestoreInstanceState(Parcelable state) {
if(state instanceof Bundle) {
if (state instanceof Bundle) {
Bundle bundle = (Bundle) state;
mSlideState = (PanelState) bundle.getSerializable(SLIDING_STATE);
mSlideState = mSlideState == null ? DEFAULT_SLIDE_STATE : mSlideState;
Expand All @@ -1338,16 +1335,13 @@ private class DragHelperCallback extends ViewDragHelper.Callback {

@Override
public boolean tryCaptureView(View child, int pointerId) {
if (mIsUnableToDrag) {
return false;
}
return !mIsUnableToDrag && child == mSlideableView;

return child == mSlideableView;
}

@Override
public void onViewDragStateChanged(int state) {
if (mDragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) {
if (mDragHelper != null && mDragHelper.getViewDragState() == ViewDragHelper.STATE_IDLE) {
mSlideOffset = computeSlideOffset(mSlideableView.getTop());
applyParallaxForCurrentSlideOffset();

Expand Down Expand Up @@ -1407,7 +1401,9 @@ public void onViewReleased(View releasedChild, float xvel, float yvel) {
target = computePanelTopPosition(0.0f);
}

mDragHelper.settleCapturedViewAt(releasedChild.getLeft(), target);
if (mDragHelper != null) {
mDragHelper.settleCapturedViewAt(releasedChild.getLeft(), target);
}
invalidate();
}

Expand Down Expand Up @@ -1466,9 +1462,10 @@ public LayoutParams(Context c, AttributeSet attrs) {
final TypedArray ta = c.obtainStyledAttributes(attrs, ATTRS);
if (ta != null) {
this.weight = ta.getFloat(0, 0);
ta.recycle();
}

ta.recycle();

}
}
}