Skip to content

Commit fa7deb3

Browse files
ashishkumar468misaochan
authored andcommitted
Closes #3262, npe in touching edit text drawable area while uploading images (#3263)
1 parent 1359f70 commit fa7deb3

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package fr.free.nrw.commons.upload.mediaDetails;
22

3+
import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult;
4+
35
import android.content.Context;
46
import android.os.Bundle;
57
import android.text.TextUtils;
@@ -11,29 +13,17 @@
1113
import android.widget.EditText;
1214
import android.widget.LinearLayout;
1315
import android.widget.TextView;
14-
1516
import androidx.annotation.NonNull;
1617
import androidx.annotation.Nullable;
1718
import androidx.appcompat.widget.AppCompatButton;
1819
import androidx.appcompat.widget.AppCompatImageButton;
1920
import androidx.recyclerview.widget.LinearLayoutManager;
2021
import androidx.recyclerview.widget.RecyclerView;
21-
22-
import com.github.chrisbanes.photoview.PhotoView;
23-
import com.jakewharton.rxbinding2.widget.RxTextView;
24-
25-
import org.apache.commons.lang3.StringUtils;
26-
27-
import java.util.ArrayList;
28-
import java.util.List;
29-
import java.util.Locale;
30-
31-
import javax.inject.Inject;
32-
import javax.inject.Named;
33-
3422
import butterknife.BindView;
3523
import butterknife.ButterKnife;
3624
import butterknife.OnClick;
25+
import com.github.chrisbanes.photoview.PhotoView;
26+
import com.jakewharton.rxbinding2.widget.RxTextView;
3727
import fr.free.nrw.commons.R;
3828
import fr.free.nrw.commons.Utils;
3929
import fr.free.nrw.commons.filepicker.UploadableFile;
@@ -52,10 +42,14 @@
5242
import fr.free.nrw.commons.utils.ImageUtils;
5343
import fr.free.nrw.commons.utils.ViewUtil;
5444
import io.reactivex.disposables.Disposable;
45+
import java.util.ArrayList;
46+
import java.util.List;
47+
import java.util.Locale;
48+
import javax.inject.Inject;
49+
import javax.inject.Named;
50+
import org.apache.commons.lang3.StringUtils;
5551
import timber.log.Timber;
5652

57-
import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult;
58-
5953
public class UploadMediaDetailFragment extends UploadBaseFragment implements
6054
UploadMediaDetailsContract.View {
6155

@@ -179,8 +173,12 @@ private void addEtTitleTouchListener() {
179173
etTitle.setOnTouchListener((v, event) -> {
180174
//2 is for drawable right
181175
float twelveDpInPixels = convertDpToPixel(12, getContext());
182-
if (event.getAction() == MotionEvent.ACTION_UP && etTitle.getCompoundDrawables()[2].getBounds().contains((int)(etTitle.getWidth()-(event.getX()+twelveDpInPixels)),(int)(event.getY()-twelveDpInPixels))){
183-
showInfoAlert(R.string.media_detail_title,R.string.title_info);
176+
if (event.getAction() == MotionEvent.ACTION_UP && etTitle.getCompoundDrawables() != null
177+
&& etTitle.getCompoundDrawables().length > 2 && etTitle
178+
.getCompoundDrawables()[2].getBounds()
179+
.contains((int) (etTitle.getWidth() - (event.getX() + twelveDpInPixels)),
180+
(int) (event.getY() - twelveDpInPixels))) {
181+
showInfoAlert(R.string.media_detail_title, R.string.title_info);
184182
return true;
185183
}
186184
return false;

0 commit comments

Comments
 (0)