From eb7e5f735d6941841693b8130c2ad0b0fb14bc1e Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Fri, 1 Jun 2018 12:28:44 +0200 Subject: [PATCH 1/2] lint: ignore setJavaScriptEnabled --- .../owncloud/android/authentication/AuthenticatorActivity.java | 2 ++ .../com/owncloud/android/ui/activity/ExternalSiteWebView.java | 3 ++- .../com/owncloud/android/ui/activity/WhatsNewActivity.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index 1fd7ab5630..2d59a0f762 100644 --- a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -42,6 +42,7 @@ package com.owncloud.android.authentication; import android.accounts.Account; import android.accounts.AccountManager; +import android.annotation.SuppressLint; import android.app.Dialog; import android.content.ComponentName; import android.content.Context; @@ -355,6 +356,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + " " + Build.MODEL; } + @SuppressLint("SetJavaScriptEnabled") private void initWebViewLogin(String baseURL) { mLoginWebView.setVisibility(View.GONE); diff --git a/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java b/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java index 0610d3d85b..70e2c948b1 100644 --- a/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java +++ b/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java @@ -21,6 +21,7 @@ package com.owncloud.android.ui.activity; +import android.annotation.SuppressLint; import android.content.Intent; import android.os.Bundle; import android.support.v4.widget.DrawerLayout; @@ -42,7 +43,6 @@ import java.io.InputStream; /** * This activity shows an URL as a web view */ - public class ExternalSiteWebView extends FileActivity { public static final String EXTRA_TITLE = "TITLE"; public static final String EXTRA_URL = "URL"; @@ -55,6 +55,7 @@ public class ExternalSiteWebView extends FileActivity { private int menuItemId; private WebView webview; + @SuppressLint("SetJavaScriptEnabled") @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.v(TAG, "onCreate() start"); diff --git a/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java b/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java index f05dc75237..cd4eaedfa5 100644 --- a/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java @@ -24,6 +24,7 @@ package com.owncloud.android.ui.activity; import android.accounts.Account; import android.accounts.AccountManager; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -265,6 +266,7 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa mWebUrl = getArguments() != null ? getArguments().getString("url") : null; } + @SuppressLint("SetJavaScriptEnabled") @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, From 6720bed292e623d62acb31a2ded16bb658fdb920 Mon Sep 17 00:00:00 2001 From: nextcloud-android-bot <> Date: Mon, 4 Jun 2018 11:22:50 +0000 Subject: [PATCH 2/2] Drone: update Lint results to reflect reduced error/warning count [skip ci] --- scripts/lint/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lint/lint-results.txt b/scripts/lint/lint-results.txt index 9b93a9c21d..9dc6fc19c4 100644 --- a/scripts/lint/lint-results.txt +++ b/scripts/lint/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 102 warnings + Lint Report: 99 warnings