Merge pull request #330 from iskradelta/master

FindBugs and PMD appeased

Author: AndyScherzinger

build.gradle

@@ -47,6 +47,7 @@ dependencies {
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
     compile 'com.getbase:floatingactionbutton:1.10.1'
+    compile 'com.google.code.findbugs:annotations:2.0.1'
 
 
     /// dependencies for local unit tests

pmd-ruleset.xml

@@ -9,6 +9,7 @@
     </description>
     <exclude-pattern>.*/R.java</exclude-pattern>
     <exclude-pattern>.*/gen/.*</exclude-pattern>
+    <exclude-pattern>.*/third_parties/.*</exclude-pattern>
 
     <rule ref="rulesets/java/logging-java.xml" />
     <rule ref="rulesets/java/braces.xml" />

src/com/owncloud/android/MainApp.java

@@ -37,6 +37,10 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.Preferences;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 
 /**
  * Main Application of the project
@@ -61,14 +65,14 @@ public class MainApp extends Application {
 
     private static boolean mOnlyOnDevice = false;
 
-    
+    @SuppressFBWarnings("ST")
     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
 
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        MainApp.storagePath = appPrefs.getString(Preferences.Keys.STORAGE_PATH, Environment.
+        MainApp.storagePath = appPrefs.getString(Preferences.PreferenceKeys.STORAGE_PATH, Environment.
                               getExternalStorageDirectory().getAbsolutePath());
 
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
@@ -196,7 +200,7 @@ public static void showOnlyFilesOnDevice(boolean state){
         mOnlyOnDevice = state;
     }
 
-    public static boolean getOnlyOnDevice(){
+    public static boolean isOnlyOnDevice(){
         return mOnlyOnDevice;
     }
 

src/com/owncloud/android/authentication/AccountAuthenticator.java

@@ -87,8 +87,7 @@ public Bundle addAccount(AccountAuthenticatorResponse response,
                 validateAccountType(accountType);
             } catch (AuthenticatorException e) {
                 Log_OC.e(TAG, "Failed to validate account type " + accountType + ": "
-                        + e.getMessage());
-                e.printStackTrace();
+                        + e.getMessage(), e);
                 return e.getFailureBundle();
             }
 
@@ -133,8 +132,7 @@ public Bundle confirmCredentials(AccountAuthenticatorResponse response,
             validateAccountType(account.type);
         } catch (AuthenticatorException e) {
             Log_OC.e(TAG, "Failed to validate account type " + account.type + ": "
-                    + e.getMessage());
-            e.printStackTrace();
+                    + e.getMessage(), e);
             return e.getFailureBundle();
         }
         Intent intent = new Intent(mContext, AuthenticatorActivity.class);
@@ -169,8 +167,7 @@ public Bundle getAuthToken(AccountAuthenticatorResponse response,
             validateAuthTokenType(authTokenType);
         } catch (AuthenticatorException e) {
             Log_OC.e(TAG, "Failed to validate account type " + account.type + ": "
-                    + e.getMessage());
-            e.printStackTrace();
+                    + e.getMessage(), e);
             return e.getFailureBundle();
         }
 

src/com/owncloud/android/authentication/AccountUtils.java

@@ -119,7 +119,7 @@ public static boolean exists(Account account, Context context) {
      */
     public static String getAccountUsername(String accountName) {
         if (accountName != null) {
-            return accountName.substring(0, accountName.lastIndexOf("@"));
+            return accountName.substring(0, accountName.lastIndexOf('@'));
         } else {
             return null;
         }
@@ -135,8 +135,9 @@ public static Account getOwnCloudAccountByName(Context context, String accountNa
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(
                 MainApp.getAccountType());
         for (Account account : ocAccounts) {
-            if(account.name.equals(accountName))
+            if(account.name.equals(accountName)) {
                 return account;
+            }
         }
         return null;
     }
@@ -241,15 +242,13 @@ public static void updateAccountVersion(Context context) {
                         );
 
                         // copy type of authentication
-                        String isSamlStr = accountMgr.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO);
-                        boolean isSaml = "TRUE".equals(isSamlStr);
-                        if (isSaml) {
+                        final String isSamlStr = accountMgr.getUserData(account, Constants.KEY_SUPPORTS_SAML_WEB_SSO);
+                        if (Boolean.parseBoolean(isSamlStr)) {
                             accountMgr.setUserData(newAccount, Constants.KEY_SUPPORTS_SAML_WEB_SSO, "TRUE");
                         }
 
-                        String isOauthStr = accountMgr.getUserData(account, Constants.KEY_SUPPORTS_OAUTH2);
-                        boolean isOAuth = "TRUE".equals(isOauthStr);
-                        if (isOAuth) {
+                        final String isOauthStr = accountMgr.getUserData(account, Constants.KEY_SUPPORTS_OAUTH2);
+                        if (Boolean.parseBoolean(isOauthStr)) {
                             accountMgr.setUserData(newAccount, Constants.KEY_SUPPORTS_OAUTH2, "TRUE");
                         }
                         /* TODO - study if it's possible to run this method in a background thread to copy the authToken

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -91,7 +91,7 @@
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
 import com.owncloud.android.utils.DisplayUtils;
-
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.security.cert.X509Certificate;
 import java.util.Map;
 
@@ -142,6 +142,8 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private static final String KEY_ASYNC_TASK_IN_PROGRESS = "AUTH_IN_PROGRESS";
     public static final String PROTOCOL_SUFFIX = "://";
     public static final String LOGIN_URL_DATA_KEY_VALUE_SEPARATOR = ":";
+    private static final String HTTPS_PROTOCOL = "https://";
+    private static final String HTTP_PROTOCOL = "http://";
 
     /// parameters from EXTRAs in starter Intent
     private byte mAction;
@@ -167,7 +169,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
     private boolean mServerIsChecked = false;
     private boolean mServerIsValid = false;
-    private boolean mPendingAutoCheck = false;
 
     private GetServerInfoOperation.ServerInfo mServerInfo = new GetServerInfoOperation.ServerInfo();
 
@@ -408,11 +409,11 @@ private void initServerPreFragment(Bundle savedInstanceState) {
             if (mAccount != null) {
                 mServerInfo.mBaseUrl = mAccountMgr.getUserData(mAccount, Constants.KEY_OC_BASE_URL);
                 // TODO do next in a setter for mBaseUrl
-                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith("https://");
+                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith(HTTPS_PROTOCOL);
                 mServerInfo.mVersion = AccountUtils.getServerVersion(mAccount);
             } else {
                 mServerInfo.mBaseUrl = getString(R.string.server_url).trim();
-                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith("https://");
+                mServerInfo.mIsSslConn = mServerInfo.mBaseUrl.startsWith(HTTPS_PROTOCOL);
             }
         } else {
             mServerStatusText = savedInstanceState.getInt(KEY_SERVER_STATUS_TEXT);
@@ -492,24 +493,16 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         findViewById(R.id.scroll).setOnTouchListener(new OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent event) {
-                if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                    if (
-                            AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(
-                                    MainApp.getAccountType()
-                            ).equals(mAuthTokenType) &&
-                                    mHostUrlInput.hasFocus()
-                            ) {
-                        checkOcServer();
-                    }
+                if (event.getAction() == MotionEvent.ACTION_DOWN &&
+                        AccountTypeUtils
+                                .getAuthTokenTypeSamlSessionCookie(MainApp
+                                        .getAccountType()).equals(mAuthTokenType) &&
+                        mHostUrlInput.hasFocus()) {
+                    checkOcServer();
                 }
                 return false;
             }
         });
-
-
-        /// step 4 - mark automatic check to be started when OperationsService is ready
-        mPendingAutoCheck = (savedInstanceState == null &&
-                (mAction != ACTION_CREATE || checkHostUrl));
     }
 
 
@@ -1127,8 +1120,9 @@ private void onGetUserNameFinish(RemoteOperationResult result) {
                 }
             }
 
-            if (success)
+            if (success) {
                 finish();
+            }
         } else {
             updateStatusIconFailUserName();
             showAuthStatus();
@@ -1197,14 +1191,15 @@ private boolean authSupported(AuthenticationMethod authMethod) {
 
     // TODO remove, if possible
     private String normalizeUrl(String url, boolean sslWhenUnprefixed) {
+
         if (url != null && url.length() > 0) {
             url = url.trim();
-            if (!url.toLowerCase().startsWith("http://") &&
-                    !url.toLowerCase().startsWith("https://")) {
+            if (!url.toLowerCase().startsWith(HTTP_PROTOCOL) &&
+                    !url.toLowerCase().startsWith(HTTP_PROTOCOL)) {
                 if (sslWhenUnprefixed) {
-                    url = "https://" + url;
+                    url = HTTPS_PROTOCOL + url;
                 } else {
-                    url = "http://" + url;
+                    url = HTTP_PROTOCOL + url;
                 }
             }
 
@@ -1259,7 +1254,7 @@ private void updateServerStatusIconAndText(RemoteOperationResult result) {
 
             case OK_NO_SSL:
             case OK:
-                if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://")) {
+                if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith(HTTP_PROTOCOL)) {
                     mServerStatusText = R.string.auth_connection_established;
                     mServerStatusIcon = R.drawable.ic_ok;
                 } else {
@@ -1340,7 +1335,7 @@ private void updateAuthStatusIconAndText(RemoteOperationResult result) {
 
             case OK_NO_SSL:
             case OK:
-                if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://")) {
+                if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith(HTTP_PROTOCOL)) {
                     mAuthStatusText = R.string.auth_connection_established;
                     mAuthStatusIcon = R.drawable.ic_ok;
                 } else {
@@ -1576,6 +1571,7 @@ private void updateAccountAuthentication() throws AccountNotFoundException {
      *
      * TODO Decide how to name the OAuth accounts
      */
+    @SuppressFBWarnings("DMI")
     private boolean createAccount(RemoteOperationResult authResult) {
         /// create and save new ownCloud account
         boolean isOAuth = AccountTypeUtils.
@@ -1782,11 +1778,10 @@ public boolean onEditorAction(TextView inputField, int actionId, KeyEvent event)
             }
 
         } else if (actionId == EditorInfo.IME_ACTION_NEXT && inputField != null &&
-                inputField.equals(mHostUrlInput)) {
-            if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).
-                    equals(mAuthTokenType)) {
+                inputField.equals(mHostUrlInput) &&
+                AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).
+                        equals(mAuthTokenType)) {
                 checkOcServer();
-            }
         }
         return false;   // always return false to grant that the software keyboard is hidden anyway
     }
@@ -1847,7 +1842,7 @@ public void onSsoFinished(String sessionCookie) {
             mAuthToken = sessionCookie;
             getRemoteUserNameOperation(sessionCookie);
             Fragment fd = getSupportFragmentManager().findFragmentByTag(SAML_DIALOG_TAG);
-            if (fd != null && fd instanceof DialogFragment) {
+            if (fd instanceof DialogFragment) {
                 Dialog d = ((DialogFragment) fd).getDialog();
                 if (d != null && d.isShowing()) {
                     d.dismiss();
@@ -1950,7 +1945,7 @@ private void doOnResumeAndBound() {
 
     private void dismissDialog(String dialogTag) {
         Fragment frag = getSupportFragmentManager().findFragmentByTag(dialogTag);
-        if (frag != null && frag instanceof DialogFragment) {
+        if (frag instanceof DialogFragment) {
             DialogFragment dialog = (DialogFragment) frag;
             dialog.dismiss();
         }

src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java

@@ -40,8 +40,8 @@
  */
 public class AuthenticatorAsyncTask  extends AsyncTask<Object, Void, RemoteOperationResult> {
 
-    private static String REMOTE_PATH = "/";
-    private static boolean SUCCESS_IF_ABSENT = false;
+    private static final String REMOTE_PATH = "/";
+    private static final boolean SUCCESS_IF_ABSENT = false;
 
     private Context mContext;
     private final WeakReference<OnAuthenticatorTaskListener> mListener;

src/com/owncloud/android/authentication/PassCodeManager.java

@@ -43,7 +43,7 @@ public class PassCodeManager {
         // other activities may be exempted, if needed
     }
 
-    private static int PASS_CODE_TIMEOUT = 1000;
+    private static final int PASS_CODE_TIMEOUT = 1000;
         // keeping a "low" positive value is the easiest way to prevent the pass code is requested on rotations
 
     public static PassCodeManager mPassCodeManagerInstance = null;