Commit 9909a9f9 authored by cco3's avatar cco3 Committed by Commit bot

Remove context param from PhysicalWebUma methods

This parameter has done nothing for a while.  It became obsolete when
we started using ContextUtils.getAppSharedPreferences().

BUG=678787

Review-Url: https://codereview.chromium.org/2600283002
Cr-Commit-Position: refs/heads/master@{#442006}
parent eb2ee1c5
...@@ -121,7 +121,7 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O ...@@ -121,7 +121,7 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
mPwsClient = new PwsClientImpl(this); mPwsClient = new PwsClientImpl(this);
int referer = getIntent().getIntExtra(REFERER_KEY, 0); int referer = getIntent().getIntExtra(REFERER_KEY, 0);
if (savedInstanceState == null) { // Ensure this is a newly-created activity. if (savedInstanceState == null) { // Ensure this is a newly-created activity.
PhysicalWebUma.onActivityReferral(this, referer); PhysicalWebUma.onActivityReferral(referer);
} }
mIsInitialDisplayRecorded = false; mIsInitialDisplayRecorded = false;
mIsRefreshing = false; mIsRefreshing = false;
...@@ -211,9 +211,9 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O ...@@ -211,9 +211,9 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
public void onPwsResults(Collection<PwsResult> pwsResults) { public void onPwsResults(Collection<PwsResult> pwsResults) {
long duration = SystemClock.elapsedRealtime() - timestamp; long duration = SystemClock.elapsedRealtime() - timestamp;
if (isUserInitiated) { if (isUserInitiated) {
PhysicalWebUma.onRefreshPwsResolution(ListUrlsActivity.this, duration); PhysicalWebUma.onRefreshPwsResolution(duration);
} else { } else {
PhysicalWebUma.onForegroundPwsResolution(ListUrlsActivity.this, duration); PhysicalWebUma.onForegroundPwsResolution(duration);
} }
// filter out duplicate groups. // filter out duplicate groups.
...@@ -241,7 +241,7 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O ...@@ -241,7 +241,7 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
*/ */
@Override @Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) { public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
PhysicalWebUma.onUrlSelected(this); PhysicalWebUma.onUrlSelected();
UrlInfo nearestUrlInfo = null; UrlInfo nearestUrlInfo = null;
PwsResult nearestPwsResult = mAdapter.getItem(position); PwsResult nearestPwsResult = mAdapter.getItem(position);
String groupId = nearestPwsResult.groupId; String groupId = nearestPwsResult.groupId;
...@@ -326,9 +326,9 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O ...@@ -326,9 +326,9 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
// Record refresh-related UMA. // Record refresh-related UMA.
if (!mIsInitialDisplayRecorded) { if (!mIsInitialDisplayRecorded) {
mIsInitialDisplayRecorded = true; mIsInitialDisplayRecorded = true;
PhysicalWebUma.onUrlsDisplayed(this, mAdapter.getCount()); PhysicalWebUma.onUrlsDisplayed(mAdapter.getCount());
} else if (mIsRefreshUserInitiated) { } else if (mIsRefreshUserInitiated) {
PhysicalWebUma.onUrlsRefreshed(this, mAdapter.getCount()); PhysicalWebUma.onUrlsRefreshed(mAdapter.getCount());
} }
mIsRefreshing = false; mIsRefreshing = false;
......
...@@ -35,7 +35,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity { ...@@ -35,7 +35,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.physical_web_optin); setContentView(R.layout.physical_web_optin);
PhysicalWebUma.onOptInNotificationPressed(this); PhysicalWebUma.onOptInNotificationPressed();
TextView description = (TextView) findViewById(R.id.physical_web_optin_description); TextView description = (TextView) findViewById(R.id.physical_web_optin_description);
description.setMovementMethod(LinkMovementMethod.getInstance()); description.setMovementMethod(LinkMovementMethod.getInstance());
...@@ -45,7 +45,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity { ...@@ -45,7 +45,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity {
declineButton.setOnClickListener(new View.OnClickListener() { declineButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
PhysicalWebUma.onOptInDeclineButtonPressed(PhysicalWebOptInActivity.this); PhysicalWebUma.onOptInDeclineButtonPressed();
PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(false); PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(false);
finish(); finish();
} }
...@@ -55,7 +55,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity { ...@@ -55,7 +55,7 @@ public class PhysicalWebOptInActivity extends AppCompatActivity {
enableButton.setOnClickListener(new View.OnClickListener() { enableButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
PhysicalWebUma.onOptInEnableButtonPressed(PhysicalWebOptInActivity.this); PhysicalWebUma.onOptInEnableButtonPressed();
PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(true); PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(true);
startActivity(createListUrlsIntent(PhysicalWebOptInActivity.this)); startActivity(createListUrlsIntent(PhysicalWebOptInActivity.this));
finish(); finish();
......
...@@ -503,8 +503,7 @@ class UrlManager { ...@@ -503,8 +503,7 @@ class UrlManager {
@Override @Override
public void onPwsResults(final Collection<PwsResult> pwsResults) { public void onPwsResults(final Collection<PwsResult> pwsResults) {
long duration = SystemClock.elapsedRealtime() - timestamp; long duration = SystemClock.elapsedRealtime() - timestamp;
PhysicalWebUma.onBackgroundPwsResolution( PhysicalWebUma.onBackgroundPwsResolution(duration);
ContextUtils.getApplicationContext(), duration);
new Handler(Looper.getMainLooper()).post(new Runnable() { new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override @Override
public void run() { public void run() {
...@@ -556,13 +555,11 @@ class UrlManager { ...@@ -556,13 +555,11 @@ class UrlManager {
// high priority notification // high priority notification
createOptInNotification(true); createOptInNotification(true);
PhysicalWeb.recordOptInNotification(); PhysicalWeb.recordOptInNotification();
PhysicalWebUma.onOptInHighPriorityNotificationShown( PhysicalWebUma.onOptInHighPriorityNotificationShown();
ContextUtils.getApplicationContext());
} else { } else {
// min priority notification // min priority notification
createOptInNotification(false); createOptInNotification(false);
PhysicalWebUma.onOptInMinPriorityNotificationShown( PhysicalWebUma.onOptInMinPriorityNotificationShown();
ContextUtils.getApplicationContext());
} }
} else if (PhysicalWeb.isPhysicalWebPreferenceEnabled()) { } else if (PhysicalWeb.isPhysicalWebPreferenceEnabled()) {
createNotification(); createNotification();
......
...@@ -62,11 +62,11 @@ public class PhysicalWebPreferenceFragment extends PreferenceFragment { ...@@ -62,11 +62,11 @@ public class PhysicalWebPreferenceFragment extends PreferenceFragment {
case REQUEST_ID: case REQUEST_ID:
if (grantResults.length > 0 if (grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) { && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
PhysicalWebUma.onPrefsLocationGranted(getActivity()); PhysicalWebUma.onPrefsLocationGranted();
Log.d(TAG, "Location permission granted"); Log.d(TAG, "Location permission granted");
PhysicalWeb.startPhysicalWeb(); PhysicalWeb.startPhysicalWeb();
} else { } else {
PhysicalWebUma.onPrefsLocationDenied(getActivity()); PhysicalWebUma.onPrefsLocationDenied();
Log.d(TAG, "Location permission denied"); Log.d(TAG, "Location permission denied");
} }
break; break;
...@@ -86,10 +86,10 @@ public class PhysicalWebPreferenceFragment extends PreferenceFragment { ...@@ -86,10 +86,10 @@ public class PhysicalWebPreferenceFragment extends PreferenceFragment {
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean enabled = (boolean) newValue; boolean enabled = (boolean) newValue;
if (enabled) { if (enabled) {
PhysicalWebUma.onPrefsFeatureEnabled(getActivity()); PhysicalWebUma.onPrefsFeatureEnabled();
ensureLocationPermission(); ensureLocationPermission();
} else { } else {
PhysicalWebUma.onPrefsFeatureDisabled(getActivity()); PhysicalWebUma.onPrefsFeatureDisabled();
} }
PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(enabled); PrivacyPreferencesManager.getInstance().setPhysicalWebEnabled(enabled);
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment