X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FViewSourceActivity.kt;h=3769a6820448a37053a785aa307e6396eb6b8722;hp=b2d50e7c79e96f56fc15c82a51588d73aadd95ff;hb=2b1677054aa2e63e86584ddcd3b3adff3cc5444f;hpb=cd609c9888924549c03cd6509ed889cdb052d5bb diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt index b2d50e7c..3769a682 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/ViewSourceActivity.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2017-2021 Soren Stoutner . + * Copyright 2017-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.activities @@ -58,7 +58,7 @@ import com.stoutner.privacybrowser.viewmodels.WebViewSource import java.util.Locale -// Declare the public constants. +// Define the public constants. const val CURRENT_URL = "current_url" const val USER_AGENT = "user_agent" @@ -91,9 +91,6 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) } - // Set the theme. - setTheme(R.style.PrivacyBrowser) - // Run the default commands. super.onCreate(savedInstanceState) @@ -106,9 +103,9 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { // Set the content view. if (bottomAppBar) { - setContentView(R.layout.view_source_coordinatorlayout_bottom_appbar) + setContentView(R.layout.view_source_bottom_appbar) } else { - setContentView(R.layout.view_source_coordinatorlayout_top_appbar) + setContentView(R.layout.view_source_top_appbar) } // Get a handle for the toolbar. @@ -121,7 +118,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { val actionBar = supportActionBar!! // Add the custom layout to the action bar. - actionBar.setCustomView(R.layout.view_source_app_bar) + actionBar.setCustomView(R.layout.view_source_appbar_custom_view) // Instruct the action bar to display a custom layout. actionBar.displayOptions = ActionBar.DISPLAY_SHOW_CUSTOM @@ -134,7 +131,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { requestHeadersTextView = findViewById(R.id.request_headers_textview) responseMessageTitleTextView = findViewById(R.id.response_message_title_textview) responseMessageTextView = findViewById(R.id.response_message_textview) - responseHeadersTitleTextView = findViewById(R.id.response_headers_title_textivew) + responseHeadersTitleTextView = findViewById(R.id.response_headers_title_textview) val responseHeadersTextView = findViewById(R.id.response_headers_textview) responseBodyTitleTextView = findViewById(R.id.response_body_title_textview) val responseBodyTextView = findViewById(R.id.response_body_textview) @@ -186,11 +183,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { } // Set the refresh color scheme according to the theme. - if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) { - swipeRefreshLayout.setColorSchemeResources(R.color.blue_700) - } else { - swipeRefreshLayout.setColorSchemeResources(R.color.violet_500) - } + swipeRefreshLayout.setColorSchemeResources(R.color.blue_text) // Initialize a color background typed value. val colorBackgroundTypedValue = TypedValue() @@ -281,10 +274,10 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { val webViewSourceFactory: ViewModelProvider.Factory = WebViewSourceFactory(currentUrl, userAgent, localeString, proxy, contentResolver, MainWebViewActivity.executorService) // Instantiate the WebView source view model class. - webViewSource = ViewModelProvider(this, webViewSourceFactory).get(WebViewSource::class.java) + webViewSource = ViewModelProvider(this, webViewSourceFactory)[WebViewSource::class.java] // Create a source observer. - webViewSource.observeSource().observe(this, { sourceStringArray: Array -> + webViewSource.observeSource().observe(this) { sourceStringArray: Array -> // Populate the text views. This can take a long time, and freezes the user interface, if the response body is particularly large. requestHeadersTextView.text = sourceStringArray[0] responseMessageTextView.text = sourceStringArray[1] @@ -297,10 +290,10 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { //Stop the swipe to refresh indicator if it is running swipeRefreshLayout.isRefreshing = false - }) + } // Create an error observer. - webViewSource.observeErrors().observe(this, { errorString: String -> + webViewSource.observeErrors().observe(this) { errorString: String -> // Display an error snackbar if the string is not `""`. if (errorString != "") { if (errorString.startsWith("javax.net.ssl.SSLHandshakeException")) { @@ -314,7 +307,7 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { Snackbar.make(swipeRefreshLayout, errorString, Snackbar.LENGTH_LONG).show() } } - }) + } // Implement swipe to refresh. swipeRefreshLayout.setOnRefreshListener { @@ -479,4 +472,4 @@ class ViewSourceActivity: AppCompatActivity(), UntrustedSslCertificateListener { responseBodyTitleTextView.setText(R.string.response_body) } } -} \ No newline at end of file +}