diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java
index 30c9138e16..d67465d5fc 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixScope.java
@@ -18,12 +18,13 @@ package im.vector.matrix.android.internal.di;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 import javax.inject.Scope;
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
+// TODO convert the 3 scope to Java?
 @Scope
 @Documented
-@Retention(RUNTIME)
-public @interface MatrixScope {}
\ No newline at end of file
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MatrixScope {
+}
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java
index 5284264178..ffa26ea7a3 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionScope.java
@@ -18,12 +18,12 @@ package im.vector.matrix.android.internal.session;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
 import javax.inject.Scope;
 
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 @Scope
 @Documented
-@Retention(RUNTIME)
-public @interface SessionScope {}
\ No newline at end of file
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SessionScope {
+}
\ No newline at end of file