X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FRequestsActivity.java;h=a62708a3f70d144ba076192ee26147043f495aca;hb=64fe50abeacf25f6fde5d3b3de11801f1618987b;hp=4b58053ac823fc94298e2957c44693ffeeb3ce99;hpb=ff072c9968034954dfc176269ab8b10a34e4424b;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java index 4b58053a..a62708a3 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/RequestsActivity.java @@ -45,7 +45,7 @@ import java.util.List; public class RequestsActivity extends AppCompatActivity implements ViewRequestDialog.ViewRequestListener { // The list view is used in `onCreate()` and `launchViewRequestDialog()`. - private ListView resourceRequestsListView; + private ListView requestsListView; @Override public void onCreate(Bundle savedInstanceState) { @@ -68,12 +68,12 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi setContentView(R.layout.requests_coordinatorlayout); // Use the `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar blockListsAppBar = findViewById(R.id.blocklists_toolbar); - setSupportActionBar(blockListsAppBar); + Toolbar requestsAppBar = findViewById(R.id.requests_toolbar); + setSupportActionBar(requestsAppBar); // Get a handle for the app bar and the list view. ActionBar appBar = getSupportActionBar(); - resourceRequestsListView = findViewById(R.id.resource_requests_listview); + requestsListView = findViewById(R.id.requests_listview); // Remove the incorrect lint warning that `appBar` might be null. assert appBar != null; @@ -165,7 +165,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter allResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(allResourceRequestsArrayAdapter); + requestsListView.setAdapter(allResourceRequestsArrayAdapter); break; case 1: // Default requests. @@ -173,7 +173,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter defaultResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), defaultResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(defaultResourceRequestsArrayAdapter); + requestsListView.setAdapter(defaultResourceRequestsArrayAdapter); break; case 2: // Allowed requests. @@ -181,7 +181,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter allowedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allowedResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(allowedResourceRequestsArrayAdapter); + requestsListView.setAdapter(allowedResourceRequestsArrayAdapter); break; case 3: // Third-party requests. @@ -189,7 +189,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter thirdPartyResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), thirdPartyResourceRequests); //Display the adapter in the list view. - resourceRequestsListView.setAdapter(thirdPartyResourceRequestsArrayAdapter); + requestsListView.setAdapter(thirdPartyResourceRequestsArrayAdapter); break; case 4: // Blocked requests. @@ -197,7 +197,7 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter blockedResourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), blockedResourceRequests); // Display the adapter in the list view. - resourceRequestsListView.setAdapter(blockedResourceRequestsArrayAdapter); + requestsListView.setAdapter(blockedResourceRequestsArrayAdapter); break; } } @@ -212,10 +212,10 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi ArrayAdapter resourceRequestsArrayAdapter = new RequestsArrayAdapter(getApplicationContext(), allResourceRequests); // Populate the list view with the resource requests adapter. - resourceRequestsListView.setAdapter(resourceRequestsArrayAdapter); + requestsListView.setAdapter(resourceRequestsArrayAdapter); // Listen for taps on entries in the list view. - resourceRequestsListView.setOnItemClickListener((AdapterView parent, View view, int position, long id) -> { + requestsListView.setOnItemClickListener((AdapterView parent, View view, int position, long id) -> { // Display the view request dialog. The list view is 0 based, so the position must be incremented by 1. launchViewRequestDialog(position + 1); }); @@ -235,10 +235,10 @@ public class RequestsActivity extends AppCompatActivity implements ViewRequestDi private void launchViewRequestDialog(int id) { // Determine if this is the last request in the list. - boolean isLastRequest = (id == resourceRequestsListView.getCount()); + boolean isLastRequest = (id == requestsListView.getCount()); // Get the string array for the selected resource request. The resource requests list view is zero based. - String[] selectedRequestStringArray = (String[]) resourceRequestsListView.getItemAtPosition(id - 1); + String[] selectedRequestStringArray = (String[]) requestsListView.getItemAtPosition(id - 1); // Remove the warning that `selectedRequest` might be null. assert selectedRequestStringArray != null;