瀏覽代碼

CR fix line length and variable namings

AndyScherzinger 7 年之前
父節點
當前提交
bd7db8f924

+ 1 - 1
src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java

@@ -119,7 +119,7 @@ public class GetServerInfoOperation extends RemoteOperation {
             if (trimmedUrl.endsWith("/")) {
                 trimmedUrl = trimmedUrl.substring(0, trimmedUrl.length() - 1);
             }
-            if(trimmedUrl.toLowerCase().endsWith(AuthenticatorUrlUtils.WEBDAV_PATH_4_0_AND_LATER)){
+            if (trimmedUrl.toLowerCase().endsWith(AuthenticatorUrlUtils.WEBDAV_PATH_4_0_AND_LATER)) {
                 trimmedUrl = trimmedUrl.substring(0,
                         trimmedUrl.length() - AuthenticatorUrlUtils.WEBDAV_PATH_4_0_AND_LATER.length());
             }

+ 6 - 3
src/main/java/com/owncloud/android/ui/activity/Preferences.java

@@ -205,7 +205,8 @@ public class Preferences extends PreferenceActivity
                     public boolean onPreferenceClick(Preference preference) {
                         String privacyUrl = getString(R.string.privacy_url);
                         if (privacyUrl.length() > 0) {
-                            Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
+                            Intent externalWebViewIntent =
+                                    new Intent(getApplicationContext(),ExternalSiteWebView.class);
                             externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE,
                                     getResources().getString(R.string.privacy));
                             externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, privacyUrl);
@@ -629,7 +630,8 @@ public class Preferences extends PreferenceActivity
                     pSyncedFolder.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                         @Override
                         public boolean onPreferenceClick(Preference preference) {
-                            Intent syncedFoldersIntent = new Intent(getApplicationContext(), SyncedFoldersActivity.class);
+                            Intent syncedFoldersIntent =
+                                    new Intent(getApplicationContext(), SyncedFoldersActivity.class);
                             syncedFoldersIntent.putExtra(SyncedFoldersActivity.EXTRA_SHOW_SIDEBAR, false);
                             startActivity(syncedFoldersIntent);
                             return true;
@@ -923,7 +925,8 @@ public class Preferences extends PreferenceActivity
                     p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                         @Override
                         public boolean onPreferenceClick(Preference preference) {
-                            Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
+                            Intent externalWebViewIntent =
+                                    new Intent(getApplicationContext(), ExternalSiteWebView.class);
                             externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, link.name);
                             externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_URL, link.url);
                             externalWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

@@ -150,8 +150,8 @@ public class UploadFilesActivity extends FileActivity implements
         mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentById(R.id.local_files_list);
         
         // Set input controllers
-        Button mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
-        mCancelBtn.setOnClickListener(this);
+        findViewById(R.id.upload_files_btn_cancel).setOnClickListener(this);
+
         mUploadBtn = (AppCompatButton) findViewById(R.id.upload_files_btn_upload);
         mUploadBtn.getBackground().setColorFilter(ThemeUtils.primaryAccentColor(), PorterDuff.Mode.SRC_ATOP);
         mUploadBtn.setOnClickListener(this);

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/SearchShareesFragment.java

@@ -182,7 +182,7 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
     private void updateListOfUserGroups() {
         // Update list of users/groups
         // TODO Refactoring: create a new {@link ShareUserListAdapter} instance with every call should not be needed
-        ShareUserListAdapter mUserGroupsAdapter = new ShareUserListAdapter(
+        ShareUserListAdapter userGroupsAdapter = new ShareUserListAdapter(
                 getActivity().getApplicationContext(),
                 R.layout.share_user_item, mShares, this
         );
@@ -192,7 +192,7 @@ public class SearchShareesFragment extends Fragment implements ShareUserListAdap
 
         if (mShares.size() > 0) {
             usersList.setVisibility(View.VISIBLE);
-            usersList.setAdapter(mUserGroupsAdapter);
+            usersList.setAdapter(userGroupsAdapter);
 
         } else {
             usersList.setVisibility(View.GONE);