From 97e3276833f60a43c937ae7cf2343255f784601d Mon Sep 17 00:00:00 2001 From: zhouqiangWang Date: Tue, 5 May 2015 04:22:15 +0800 Subject: [PATCH] removeSliderAt(position) function not work #88 and a NPE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. fixed removeSliderAt(position) function not work #88 logic mistake. 2. NullPointerException in MainActivity.java 05-05 04:12:14.960 472-472/? E/AndroidRuntime﹕ FATAL EXCEPTION: main Process: com.daimajia.slider.demo, PID: 472 java.lang.RuntimeException: Unable to start activity ComponentInfo{com.daimajia.slider.demo/com.daimajia.slider.demo.MainActivity}: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.os.Bundle.putString(java.lang.String, java.lang.String)' on a null object reference at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2298) .... Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.os.Bundle.putString(java.lang.String, java.lang.String)' on a null object reference at com.daimajia.slider.demo.MainActivity.onCreate(MainActivity.java:57) at android.app.Activity.performCreate(Activity.java:5933) at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1105) --- .../src/main/java/com/daimajia/slider/demo/MainActivity.java | 5 +++-- .../main/java/com/daimajia/slider/library/SliderAdapter.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java index c150044..5004849 100644 --- a/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java +++ b/demo/src/main/java/com/daimajia/slider/demo/MainActivity.java @@ -54,8 +54,9 @@ protected void onCreate(Bundle savedInstanceState) { .setOnSliderClickListener(this); //add your extra information - textSliderView.getBundle() - .putString("extra",name); + if (textSliderView.getBundle() != null) + textSliderView.getBundle() + .putString("extra",name); mDemoSlider.addSlider(textSliderView); } diff --git a/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java b/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java index 238564c..bc0a90a 100644 --- a/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java +++ b/library/src/main/java/com/daimajia/slider/library/SliderAdapter.java @@ -49,7 +49,7 @@ public void removeSlider(T slider){ } public void removeSliderAt(int position){ - if(mImageContents.size() < position){ + if(mImageContents.size() > position){ mImageContents.remove(position); notifyDataSetChanged(); }