From 520eb5474c2f585b09c9b8ba1e8a58a121caa829 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 21 May 2013 08:37:52 -0700 Subject: [PATCH] s/getSherlockActivity/getActivity/ in recent code Where we don't specifically need action-bar or fragment-related stuff, it's cleaner to use regular getActivity(). If/when the action bar shows up in the general support libraries that'll be easier to update. --- .../contributions/ContributionsListFragment.java | 2 +- .../commons/media/MediaDetailPagerFragment.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java index 4c17cc18f..685b55cd4 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java @@ -274,7 +274,7 @@ public class ContributionsListFragment extends SherlockFragment { contributionsList.setSelection(savedInstanceState.getInt("grid-position")); } - SharedPreferences prefs = this.getSherlockActivity().getSharedPreferences("prefs", Context.MODE_PRIVATE); + SharedPreferences prefs = this.getActivity().getSharedPreferences("prefs", Context.MODE_PRIVATE); String lastModified = prefs.getString("lastSyncTimestamp", ""); if (lastModified.equals("")) { waitingMessage.setVisibility(View.VISIBLE); diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java index f678c0343..9e11d13d7 100644 --- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailPagerFragment.java @@ -139,12 +139,12 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa return true; case R.id.menu_retry_current_image: // Is this... sane? :) - ((ContributionsActivity)getSherlockActivity()).retryUpload(pager.getCurrentItem()); + ((ContributionsActivity)getActivity()).retryUpload(pager.getCurrentItem()); getSherlockActivity().getSupportFragmentManager().popBackStack(); return true; case R.id.menu_abort_current_image: // todo: delete image - ((ContributionsActivity)getSherlockActivity()).deleteUpload(pager.getCurrentItem()); + ((ContributionsActivity)getActivity()).deleteUpload(pager.getCurrentItem()); getSherlockActivity().getSupportFragmentManager().popBackStack(); return true; default: @@ -184,7 +184,7 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa req.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); } - final DownloadManager manager = (DownloadManager)getSherlockActivity().getSystemService(Context.DOWNLOAD_SERVICE); + final DownloadManager manager = (DownloadManager)getActivity().getSystemService(Context.DOWNLOAD_SERVICE); final long downloadId = manager.enqueue(req); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { @@ -203,17 +203,17 @@ public class MediaDetailPagerFragment extends SherlockFragment implements ViewPa if (status == DownloadManager.STATUS_SUCCESSFUL) { // Force Gallery to index the new file Uri mediaUri = Uri.parse("file://" + Environment.getExternalStorageDirectory()); - getSherlockActivity().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, mediaUri)); + getActivity().sendBroadcast(new Intent(Intent.ACTION_MEDIA_MOUNTED, mediaUri)); // todo: show a persistent notification? } } else { Log.d("Commons", "Couldn't get download status for some reason"); } - getSherlockActivity().unregisterReceiver(this); + getActivity().unregisterReceiver(this); } }; - getSherlockActivity().registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)); + getActivity().registerReceiver(onComplete, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)); } }