mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #193 from misaochan/media-detail-adapter

Browse source 
Call notifyDataSetChanged() on MediaDetailAdapter
This commit is contained in:
Nicolas Raoul 2016-07-18 19:57:39 +09:00 • committed by GitHub
commit f2faa9a369
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -84,19 +84,23 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa
View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false); View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false);
pager = (ViewPager) view.findViewById(R.id.mediaDetailsPager); pager = (ViewPager) view.findViewById(R.id.mediaDetailsPager);
pager.setOnPageChangeListener(this); pager.setOnPageChangeListener(this);
final MediaDetailAdapter adapter = new MediaDetailAdapter(getChildFragmentManager());
if(savedInstanceState != null) { if(savedInstanceState != null) {
final int pageNumber = savedInstanceState.getInt("current-page"); final int pageNumber = savedInstanceState.getInt("current-page");
// Adapter doesn't seem to be loading immediately. // Adapter doesn't seem to be loading immediately.
// Dear God, please forgive us for our sins // Dear God, please forgive us for our sins
view.postDelayed(new Runnable() { view.postDelayed(new Runnable() {
public void run() { public void run() {
pager.setAdapter(new MediaDetailAdapter(getChildFragmentManager())); pager.setAdapter(adapter);
pager.setCurrentItem(pageNumber, false); pager.setCurrentItem(pageNumber, false);
getActivity().supportInvalidateOptionsMenu(); getActivity().supportInvalidateOptionsMenu();
adapter.notifyDataSetChanged();
} }
}, 100); }, 100);
} else { } else {
pager.setAdapter(new MediaDetailAdapter(getChildFragmentManager())); pager.setAdapter(adapter);
} }
return view; return view;
} }

10
app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
View file

@ -63,13 +63,19 @@ public class GPSExtractor {
if (location != null) { if (location != null) {
myLocationListener.onLocationChanged(location); myLocationListener.onLocationChanged(location);
} }
} catch (IllegalArgumentException e){ } catch (IllegalArgumentException e) {
Log.e(TAG, "Illegal argument exception", e); Log.e(TAG, "Illegal argument exception", e);
} catch (SecurityException e) {
Log.e(TAG, "Security exception", e);
} }
} }
protected void unregisterLocationManager() { protected void unregisterLocationManager() {
locationManager.removeUpdates(myLocationListener); try {
locationManager.removeUpdates(myLocationListener);
} catch (SecurityException e) {
Log.e(TAG, "Security exception", e);
}
} }
/** /**