#25 完成5.0以下修改存储路径

.gitignore

@@ -8,7 +8,7 @@ build/
 
 # Intellij
 *.iml
-.idea
+.idea/
 
 # Local configuration file (sdk path, etc)
 local.properties

app/src/main/AndroidManifest.xml

@@ -63,6 +63,9 @@
             android:name=".ui.activity.PartFavoriteActivity"
             android:screenOrientation="portrait"/>
 
+        <activity android:name=".ui.activity.DirPickerActivity"
+            android:screenOrientation="portrait"/>
+
         <activity
             android:name=".ui.activity.settings.EventSettingsActivity"
             android:configChanges="orientation|screenSize"/>

app/src/main/java/com/hiroshi/cimoc/CimocApplication.java

@@ -56,8 +56,9 @@ public void initRootDocumentFile() {
             File file = new File(Environment.getExternalStorageDirectory().getAbsolutePath(), "Cimoc");
             if (file.exists() || file.mkdirs()) {
                 mDocumentFile = DocumentFile.fromFile(file);
+            } else {
+                mDocumentFile = null;
             }
-            mDocumentFile = DocumentFile.fromFile(new File(Environment.getExternalStorageDirectory().getAbsolutePath()));
         } else if (uri.startsWith("content")) {
             mDocumentFile = DocumentFile.fromTreeUri(this, Uri.parse(uri));
         } else {

app/src/main/java/com/hiroshi/cimoc/core/Download.java

@@ -48,24 +48,22 @@ private static DocumentFile createComicIndex(DocumentFile root, Comic comic) {
         return null;
     }
 
-    public static Observable<Void> updateComicIndex(final List<Chapter> list, final Comic comic) {
-        return Observable.create(new Observable.OnSubscribe<Void>() {
-            @Override
-            public void call(Subscriber<? super Void> subscriber) {
-                ContentResolver resolver = CimocApplication.getResolver();
-                DocumentFile root = CimocApplication.getDocumentFile();
-                try {
-                    createNoMedia(root);
-                    String jsonString = getJsonFromComic(list, comic);
-                    DocumentFile file = createComicIndex(root, comic);
-                    DocumentUtils.writeStringToFile(resolver, file, "cimoc".concat(jsonString));
-                    subscriber.onNext(null);
-                    subscriber.onCompleted();
-                } catch (Exception e) {
-                    subscriber.onError(e);
-                }
-            }
-        }).observeOn(Schedulers.io());
+    /**
+     * 写漫画索引，不关心是否成功，若没有索引文件，则不能排序章节及扫描恢复漫画，但不影响下载及观看
+     * @param list
+     * @param comic
+     */
+    public static void updateComicIndex(List<Chapter> list, Comic comic) {
+        ContentResolver resolver = CimocApplication.getResolver();
+        DocumentFile root = CimocApplication.getDocumentFile();
+        try {
+            createNoMedia(root);
+            String jsonString = getJsonFromComic(list, comic);
+            DocumentFile file = createComicIndex(root, comic);
+            DocumentUtils.writeStringToFile(resolver, file, "cimoc".concat(jsonString));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private static String getJsonFromComic(List<Chapter> list, Comic comic) throws JSONException {

app/src/main/java/com/hiroshi/cimoc/core/manager/TaskManager.java

@@ -39,8 +39,9 @@ public Observable<List<Task>> listInRx() {
                 .list();
     }
 
-    public long insert(Task task) {
-        return mTaskDao.insert(task);
+    public void insert(Task task) {
+        long id = mTaskDao.insert(task);
+        task.setId(id);
     }
 
     public void update(Task task) {

app/src/main/java/com/hiroshi/cimoc/global/FastClick.java

@@ -10,7 +10,7 @@ public class FastClick {
 
     public static boolean isClickValid() {
         long cur = System.currentTimeMillis();
-        boolean valid = cur - last > 800;
+        boolean valid = cur - last > 600;
         if (valid) {
             last = cur;
         }