8.0 8.1 app crash fix

tkrajina · Oct 28, 2018 · 65e259c · 65e259c
1 parent 4af8b6e
commit 65e259c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/10000sentencesapp/src/main/AndroidManifest.xml b/10000sentencesapp/src/main/AndroidManifest.xml
@@ -17,9 +17,8 @@
         android:theme="@style/AppTheme">
 
         <provider
-            android:name="com.activeandroid.content.ContentProvider"
-            android:authorities="info.puzz.a10000sentences"
-            android:enabled="true"
+            android:name=".dao.DatabaseContentProvider"
+            android:authorities="${applicationId}"
             android:exported="false" />
 
         <meta-data
@@ -28,9 +27,6 @@
         <meta-data
             android:name="AA_DB_VERSION"
             android:value="10" />
-        <meta-data
-            android:name="AA_MODELS"
-            android:value="info.puzz.a10000sentences.models.Language,info.puzz.a10000sentences.models.Sentence,info.puzz.a10000sentences.models.SentenceCollection,info.puzz.a10000sentences.models.SentenceHistory,info.puzz.a10000sentences.models.Annotation,info.puzz.a10000sentences.models.WordAnnotation" />
 
         <activity
             android:name=".activities.CollectionsActivity"

diff --git a/10000sentencesapp/src/main/java/info/puzz/a10000sentences/dao/DatabaseContentProvider.java b/10000sentencesapp/src/main/java/info/puzz/a10000sentences/dao/DatabaseContentProvider.java
@@ -0,0 +1,18 @@
+package info.puzz.a10000sentences.dao;
+
+import com.activeandroid.Configuration;
+import com.activeandroid.content.ContentProvider;
+
+public class DatabaseContentProvider extends ContentProvider {
+    @Override
+    protected Configuration getConfiguration() {
+        Configuration.Builder builder = new Configuration.Builder(getContext());
+        builder.addModelClass(info.puzz.a10000sentences.models.Language.class);
+        builder.addModelClass(info.puzz.a10000sentences.models.Sentence.class);
+        builder.addModelClass(info.puzz.a10000sentences.models.SentenceCollection.class);
+        builder.addModelClass(info.puzz.a10000sentences.models.SentenceHistory.class);
+        builder.addModelClass(info.puzz.a10000sentences.models.Annotation.class);
+        builder.addModelClass(info.puzz.a10000sentences.models.WordAnnotation.class);
+        return builder.create();
+    }
+}