Merge pull request #4253 from nextcloud/fixMaster

Master: get lint/warnings down

.idea/codeStyles/Project.xml

@@ -59,6 +59,10 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+    </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="120" />
     </MarkdownNavigatorCodeStyleSettings>

scripts/analysis/findbugs-results.txt

@@ -1 +1 @@
-422
+423

src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java

@@ -37,7 +37,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
  * Instrumented unit test, to be run in an Android emulator or device.
  *
  * At the moment, it's a sample to validate the automatic test environment, in the scope of instrumented unit tests.
- *
+ *vvlcvlc
  * Don't take it as an example of completeness.
  *
  * See http://developer.android.com/intl/es/training/testing/unit-testing/instrumented-unit-tests.html .

src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt

@@ -22,7 +22,6 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
-
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.BuildConfig
@@ -41,9 +40,10 @@ internal class OnboardingServiceImpl constructor(
         const val ITEM_VERSION_CODE = 99999999
     }
 
-    private val notSeenYet: Boolean get() {
-        return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE
-    }
+    private val notSeenYet: Boolean
+        get() {
+            return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE
+        }
 
     override val whatsNew: Array<FeatureItem>
         get() = if (!isFirstRun && notSeenYet) {

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -86,7 +86,6 @@ import com.owncloud.android.ui.activities.ActivitiesActivity;
 import com.owncloud.android.ui.events.AccountRemovedEvent;
 import com.owncloud.android.ui.events.ChangeMenuEvent;
 import com.owncloud.android.ui.events.DummyDrawerEvent;
-import com.owncloud.android.ui.events.MenuItemClickEvent;
 import com.owncloud.android.ui.events.SearchEvent;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.trashbin.TrashbinActivity;
@@ -385,23 +384,6 @@ public abstract class DrawerActivity extends ToolbarActivity
         DrawerMenuUtil.removeMenuItem(menu, R.id.nav_logout, !getResources().getBoolean(R.bool.show_drawer_logout));
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onMessageEvent(MenuItemClickEvent event) {
-        unsetAllDrawerMenuItems();
-
-        switch (event.menuItem.getItemId()) {
-            case R.id.nav_bar_files:
-                showFiles(false);
-                break;
-            case R.id.nav_bar_settings:
-                Intent settingsIntent = new Intent(getApplicationContext(), SettingsActivity.class);
-                startActivity(settingsIntent);
-                break;
-            default:
-                break;
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(DummyDrawerEvent event) {
         unsetAllDrawerMenuItems();

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -45,7 +45,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.PopupMenu;
-import android.widget.RelativeLayout;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.client.account.UserAccountManager;
@@ -279,17 +278,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
             currentSearchType = SearchType.NO_SEARCH;
         }
 
-        if (savedInstanceState != null) {
-            final View fabView = v.findViewById(R.id.fab_main);
-            final RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)
-                    fabView.getLayoutParams();
-            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1);
-            new Handler().post(() -> {
-                fabView.setLayoutParams(layoutParams);
-                fabView.invalidate();
-            });
-        }
-
         Bundle args = getArguments();
         boolean allowContextualActions = args != null && args.getBoolean(ARG_ALLOW_CONTEXTUAL_ACTIONS, false);
         if (allowContextualActions) {

src/main/res/drawable/settings.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
-
-    <path
-        android:fillColor="#000000"
-        android:fillAlpha=".5"
-        android:strokeAlpha=".5"
-        android:strokeWidth="1"
-        android:pathData="M6.94 0.5c-0.24 0-0.44 0.2-0.44 0.44v1.26c-0.5 0.14-1.05 0.35-1.53 0.65l-0.91-0.91c-0.16-0.18-0.46-0.19-0.62 0l-1.5 1.5c-0.18 0.17-0.18 0.46 0 0.62l0.91 0.91c-0.284 0.48-0.5 1-0.65 1.53h-1.26c-0.24 0-0.44 0.2-0.44 0.44v2.12c0 0.25 0.19 0.44 0.44 0.44h1.26c0.14 0.54 0.36 1.05 0.65 1.53l-0.91 0.91c-0.18 0.17-0.18 0.45 0 0.62l1.5 1.5c0.18 0.18 0.46 0.18 0.62 0l0.91-0.91c0.48 0.285 1 0.5 1.53 0.65v1.26c0 0.25 0.2 0.44 0.44 0.44h2.12c0.24 0 0.45-0.2 0.44-0.44v-1.26c0.54-0.14 1.05-0.36 1.53-0.65l0.91 0.91c0.17 0.18 0.45 0.18 0.62 0l1.5-1.5c0.18-0.17 0.18-0.45 0-0.62l-0.91-0.91c0.29-0.48 0.5-1 0.65-1.53h1.26c0.24 0 0.45-0.2 0.44-0.44v-2.12c0-0.24-0.2-0.44-0.44-0.44h-1.26c-0.14-0.54-0.36-1.05-0.65-1.53l0.91-0.91c0.18-0.17 0.18-0.45 0-0.62l-1.5-1.5c-0.17-0.18-0.45-0.18-0.62 0l-0.91 0.91c-0.48-0.29-1-0.5-1.53-0.65v-1.26c0-0.24-0.2-0.44-0.44-0.44h-2.12zm1.06 4a3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1 -3.5 3.5 3.5 3.5 0 0 1 -3.5 -3.5 3.5 3.5 0 0 1 3.5 -3.5z"/>
-</vector>

src/main/res/menu/navigation_bar_menu.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/nav_bar_files"
-        android:icon="@drawable/all_files"
-        android:title="@string/drawer_item_all_files"/>
-    <item
-        android:id="@+id/nav_bar_favorites"
-        android:icon="@drawable/favorite"
-        android:title="@string/drawer_item_favorites"/>
-    <item
-        android:id="@+id/nav_bar_photos"
-        android:icon="@drawable/nav_photos"
-        android:title="@string/drawer_item_photos"/>
-    <item
-        android:id="@+id/nav_bar_settings"
-        android:icon="@drawable/settings"
-        android:title="@string/drawer_item_settings"/>
-</menu>

src/main/res/values/strings.xml

@@ -27,7 +27,6 @@
     <string name="drawer_item_recently_modified">Recently modified</string>
     <string name="drawer_item_shared">Shared</string>
     <string name="drawer_item_videos">Videos</string>
-    <string name="drawer_item_settings">Settings</string>
     <string name="drawer_item_uploads_list">Uploads</string>
     <string name="drawer_item_activities">Activities</string>
     <string name="drawer_item_notifications">Notifications</string>

src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt

@@ -26,7 +26,13 @@ import android.content.Intent
 import android.os.BatteryManager
 import android.os.Build
 import android.os.PowerManager
-import com.nhaarman.mockitokotlin2.*
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before