import androidx.viewpager.widget.ViewPager;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewFeature;
+import kotlin.Pair;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
// Consume the event.
return true;
- } else if (menuItemId == R.id.share_url) { // Share URL.
- // Setup the share string.
+ } else if (menuItemId == R.id.share_message) { // Share a message.
+ // Prepare the share string.
String shareString = currentWebView.getTitle() + " – " + currentWebView.getUrl();
// Create the share intent.
- Intent shareIntent = new Intent(Intent.ACTION_SEND);
+ Intent shareMessageIntent = new Intent(Intent.ACTION_SEND);
// Add the share string to the intent.
- shareIntent.putExtra(Intent.EXTRA_TEXT, shareString);
+ shareMessageIntent.putExtra(Intent.EXTRA_TEXT, shareString);
// Set the MIME type.
- shareIntent.setType("text/plain");
+ shareMessageIntent.setType("text/plain");
// Set the intent to open in a new task.
- shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ shareMessageIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
// Make it so.
- startActivity(Intent.createChooser(shareIntent, getString(R.string.share_url)));
+ startActivity(Intent.createChooser(shareMessageIntent, getString(R.string.share_message)));
+
+ // Consume the event.
+ return true;
+ } else if (menuItemId == R.id.share_url) { // Share URL.
+ // Create the share intent.
+ Intent shareUrlIntent = new Intent(Intent.ACTION_SEND);
+
+ // Add the URL to the intent.
+ shareUrlIntent.putExtra(Intent.EXTRA_TEXT, currentWebView.getUrl());
+
+ // Add the title to the intent.
+ shareUrlIntent.putExtra(Intent.EXTRA_SUBJECT, currentWebView.getTitle());
+
+ // Set the MIME type.
+ shareUrlIntent.setType("text/plain");
+
+ // Set the intent to open in a new task.
+ shareUrlIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+ //Make it so.
+ startActivity(Intent.createChooser(shareUrlIntent, getString(R.string.share_url)));
// Consume the event.
return true;
Uri currentUri = Uri.parse(currentWebView.getUrl());
String currentDomain = currentUri.getHost();
- // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
- DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0);
+ // Initialize the database handler.
+ DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this);
// Create the domain and store the database ID.
int newDomainDatabaseId = domainsDatabaseHelper.addDomain(currentDomain);
drawerLayout.setDrawerTitle(GravityCompat.START, getString(R.string.navigation_drawer));
drawerLayout.setDrawerTitle(GravityCompat.END, getString(R.string.bookmarks));
- // Initialize the bookmarks database helper. The `0` specifies a database version, but that is ignored and set instead using a constant in `BookmarksDatabaseHelper`.
- bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this, null, null, 0);
+ // Initialize the bookmarks database helper.
+ bookmarksDatabaseHelper = new BookmarksDatabaseHelper(this);
// Initialize `currentBookmarksFolder`. `""` is the home folder in the database.
currentBookmarksFolder = "";
}
}
- // Initialize the database handler. The `0` specifies the database version, but that is ignored and set instead using a constant in `DomainsDatabaseHelper`.
- DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this, null, null, 0);
+ // Initialize the database handler.
+ DomainsDatabaseHelper domainsDatabaseHelper = new DomainsDatabaseHelper(this);
// Get a full cursor from `domainsDatabaseHelper`.
Cursor domainNameCursor = domainsDatabaseHelper.getDomainNameCursorOrderedByDomain();
// Get the domain name column index.
int domainNameColumnIndex = domainNameCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.DOMAIN_NAME);
- // Populate `domainSettingsSet`.
+ // Populate the domain settings set.
for (int i = 0; i < domainNameCursor.getCount(); i++) {
// Move the domains cursor to the current row.
domainNameCursor.moveToPosition(i);
domainSettingsSet.add(domainNameCursor.getString(domainNameColumnIndex));
}
- // Close `domainNameCursor.
+ // Close the domain name cursor.
domainNameCursor.close();
// Initialize the domain name in database variable.
}
// Check all the subdomains of the host name against wildcard domains in the domain cursor.
- while (!nestedScrollWebView.getDomainSettingsApplied() && newHostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the host name.
+ while (!nestedScrollWebView.getDomainSettingsApplied() && newHostName.contains(".")) { // Stop checking if domain settings are already applied or there are no more `.` in the hostname.
if (domainSettingsSet.contains("*." + newHostName)) { // Check the host name prepended by `*.`.
// Set the domain settings applied tracker to true.
nestedScrollWebView.setDomainSettingsApplied(true);
String[] userAgentDataArray = getResources().getStringArray(R.array.user_agent_data);
if (nestedScrollWebView.getDomainSettingsApplied()) { // The url has custom domain settings.
- // Get a cursor for the current host and move it to the first position.
+ // Remove the incorrect lint warning below that the domain name in database might be null.
+ assert domainNameInDatabase != null;
+
+ // Get a cursor for the current host.
Cursor currentDomainSettingsCursor = domainsDatabaseHelper.getCursorForDomainName(domainNameInDatabase);
+
+ // Move to the first position.
currentDomainSettingsCursor.moveToFirst();
// Get the settings from the cursor.
- nestedScrollWebView.setDomainSettingsDatabaseId(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper._ID)));
+ nestedScrollWebView.setDomainSettingsDatabaseId(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ID)));
nestedScrollWebView.getSettings().setJavaScriptEnabled(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ENABLE_JAVASCRIPT)) == 1);
nestedScrollWebView.setAcceptCookies(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.COOKIES)) == 1);
nestedScrollWebView.getSettings().setDomStorageEnabled(currentDomainSettingsCursor.getInt(currentDomainSettingsCursor.getColumnIndexOrThrow(DomainsDatabaseHelper.ENABLE_DOM_STORAGE)) == 1);
// Proceed to the website if the current SSL website certificate matches the pinned domain certificate.
if (nestedScrollWebView.hasPinnedSslCertificate()) {
// Get the pinned SSL certificate.
- ArrayList<Object> pinnedSslCertificateArrayList = nestedScrollWebView.getPinnedSslCertificate();
+ Pair<String[], Date[]> pinnedSslCertificatePair = nestedScrollWebView.getPinnedSslCertificate();
// Extract the arrays from the array list.
- String[] pinnedSslCertificateStringArray = (String[]) pinnedSslCertificateArrayList.get(0);
- Date[] pinnedSslCertificateDateArray = (Date[]) pinnedSslCertificateArrayList.get(1);
+ String[] pinnedSslCertificateStringArray = pinnedSslCertificatePair.getFirst();
+ Date[] pinnedSslCertificateDateArray = pinnedSslCertificatePair.getSecond();
// Check if the current SSL certificate matches the pinned certificate.
if (currentWebsiteIssuedToCName.equals(pinnedSslCertificateStringArray[0]) && currentWebsiteIssuedToOName.equals(pinnedSslCertificateStringArray[1]) &&
projects / PrivacyBrowserAndroid.git / blobdiff