Эх сурвалжийг харах

reformat imports
kotlin: do not use wildcard imports

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky 5 жил өмнө
parent
commit
ac3a6d5421

+ 4 - 0
.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>

+ 4 - 5
src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt

@@ -22,12 +22,10 @@ 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
 import com.owncloud.android.R
-import com.owncloud.android.authentication.AuthenticatorActivity
 import com.owncloud.android.features.FeatureItem
 import com.owncloud.android.ui.activity.PassCodeActivity
 
@@ -41,9 +39,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) {

+ 7 - 1
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