From 7592b0bae1ee0c1ff3b63b2a32d9f925e13756bd Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 15 Jul 2016 17:13:39 +1200 Subject: [PATCH 1/3] Add catch for SecurityException --- .../java/fr/free/nrw/commons/upload/GPSExtractor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java index 2bf9fe79f..2f76e3149 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java @@ -63,13 +63,19 @@ public class GPSExtractor { if (location != null) { myLocationListener.onLocationChanged(location); } - } catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { Log.e(TAG, "Illegal argument exception", e); + } catch (SecurityException e) { + Log.e(TAG, "Security exception", e); } } protected void unregisterLocationManager() { - locationManager.removeUpdates(myLocationListener); + try { + locationManager.removeUpdates(myLocationListener); + } catch (SecurityException e) { + Log.e(TAG, "Security exception", e); + } } /** From 73a87c822ff74422c9551822a744dc12b186c0e5 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 18 Jul 2016 21:01:45 +1200 Subject: [PATCH 2/3] Initialize adapter --- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index a9a2b2066..78df8c249 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -84,19 +84,21 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false); pager = (ViewPager) view.findViewById(R.id.mediaDetailsPager); pager.setOnPageChangeListener(this); + final MediaDetailAdapter adapter = new MediaDetailAdapter(getChildFragmentManager()); + if(savedInstanceState != null) { final int pageNumber = savedInstanceState.getInt("current-page"); // Adapter doesn't seem to be loading immediately. // Dear God, please forgive us for our sins view.postDelayed(new Runnable() { public void run() { - pager.setAdapter(new MediaDetailAdapter(getChildFragmentManager())); + pager.setAdapter(adapter); pager.setCurrentItem(pageNumber, false); getActivity().supportInvalidateOptionsMenu(); } }, 100); } else { - pager.setAdapter(new MediaDetailAdapter(getChildFragmentManager())); + pager.setAdapter(adapter); } return view; } From a633e74cce52a9ecdc871f3d2af6dfd75d817658 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 18 Jul 2016 21:04:29 +1200 Subject: [PATCH 3/3] Add notifyDataSetChanged() --- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 78df8c249..62ecf6c37 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -84,6 +84,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false); pager = (ViewPager) view.findViewById(R.id.mediaDetailsPager); pager.setOnPageChangeListener(this); + final MediaDetailAdapter adapter = new MediaDetailAdapter(getChildFragmentManager()); if(savedInstanceState != null) { @@ -95,6 +96,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa pager.setAdapter(adapter); pager.setCurrentItem(pageNumber, false); getActivity().supportInvalidateOptionsMenu(); + adapter.notifyDataSetChanged(); } }, 100); } else {