extracted getAndroidFilesDir

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/BoxStoreBuilder.java

@@ -21,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import io.objectbox.annotation.apihint.Internal;
 import io.objectbox.ideasonly.ModelUpdate;
 
@@ -146,18 +148,7 @@ public BoxStoreBuilder androidContext(Object context) {
  if (context == null) {
  throw new NullPointerException("Context may not be null");
  }
- File filesDir;
- try {
- Method getFilesDir = context.getClass().getMethod("getFilesDir");
- filesDir = (File) getFilesDir.invoke(context);
- } catch (Exception e) {
- throw new RuntimeException(
- "Could not init with given Android context (must be sub class of android.content.Context)", e);
- }
- if (filesDir == null) {
- throw new IllegalStateException("Android files dir is null");
- }
- File baseDir = new File(filesDir, "objectbox");
+ File baseDir = new File(getAndroidFilesDir(context), "objectbox");
  if (!baseDir.exists()) {
  boolean ok = baseDir.mkdirs();
  if (!ok) {
@@ -172,6 +163,23 @@ public BoxStoreBuilder androidContext(Object context) {
  return this;
  }
 
+ @Nonnull
+ private File getAndroidFilesDir(Object context) {
+ File filesDir;
+ try {
+ Method getFilesDir = context.getClass().getMethod("getFilesDir");
+ filesDir = (File) getFilesDir.invoke(context);
+ } catch (Exception e) {
+ throw new RuntimeException(
+ "Could not init with given Android context (must be sub class of android.content.Context)", e);
+ }
+ if (filesDir == null) {
+ // TODO should we consider https://issuetracker.google.com/issues/36918154 ?
+ throw new IllegalStateException("Android files dir is null");
+ }
+ return filesDir;
+ }
+
  /**
  * Sets the maximum number of concurrent readers. For most applications, the default is fine (> 100 readers).
  * <p>