enable files cached

Author: Tneciv

app/src/main/AndroidManifest.xml

@@ -49,9 +49,6 @@
             android:label="Welcome"
             android:parentActivityName=".home.view.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.tneciv.zhihudaily.home.view.MainActivity" />
         </activity>
         <activity
             android:name=".github.GithubActivity"

app/src/main/java/com/tneciv/zhihudaily/detail/presenter/DetailPresenterCompl.java

@@ -1,9 +1,11 @@
 package com.tneciv.zhihudaily.detail.presenter;
 
+import android.content.Context;
+
 import com.google.gson.Gson;
 import com.tneciv.zhihudaily.api.ZhihuApi;
 import com.tneciv.zhihudaily.detail.model.ContentEntity;
-import com.tneciv.zhihudaily.detail.view.IDeatilView;
+import com.tneciv.zhihudaily.utils.CacheUtil;
 import com.tneciv.zhihudaily.utils.OkhttpUtil;
 
 import java.io.IOException;
@@ -18,15 +20,15 @@
  * Created by Tneciv on 1-16-0016.
  */
 public class DetailPresenterCompl implements IDetailPresenter {
-    private IDeatilView iDeatilView;
+    private Context mContext;
 
-    public DetailPresenterCompl(IDeatilView iDeatilView) {
-        this.iDeatilView = iDeatilView;
+    public DetailPresenterCompl(Context context) {
+        this.mContext = context;
     }
 
     @Override
-    public void requestNewsContent(int id) {
-        String newsContentUrl = ZhihuApi.getNewsContentUrl(id);
+    public void requestNewsContent(final int id) {
+        final String newsContentUrl = ZhihuApi.getNewsContentUrl(id);
         Request request = new Request.Builder().get().url(newsContentUrl).build();
         OkhttpUtil.getInstance().newCall(request).enqueue(new Callback() {
             @Override
@@ -37,6 +39,7 @@ public void onFailure(Call call, IOException e) {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 String string = response.body().string();
+                new CacheUtil(mContext).cacheFiles(String.valueOf(id), string);
                 Gson gson = new Gson();
                 ContentEntity entity = gson.fromJson(string, ContentEntity.class);
                 EventBus.getDefault().post(entity);

app/src/main/java/com/tneciv/zhihudaily/detail/view/DetailActivity.java

@@ -10,25 +10,25 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.daimajia.androidanimations.library.Techniques;
 import com.daimajia.androidanimations.library.YoYo;
+import com.google.gson.Gson;
 import com.squareup.leakcanary.RefWatcher;
 import com.squareup.picasso.Picasso;
 import com.tneciv.zhihudaily.MyApplication;
 import com.tneciv.zhihudaily.R;
 import com.tneciv.zhihudaily.detail.model.ContentEntity;
 import com.tneciv.zhihudaily.detail.presenter.DetailPresenterCompl;
 import com.tneciv.zhihudaily.detail.presenter.IDetailPresenter;
+import com.tneciv.zhihudaily.utils.CacheUtil;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -39,10 +39,10 @@
 public class DetailActivity extends AppCompatActivity implements IDeatilView {
 
     private String title;
-
     private int id;
-
     private IDetailPresenter iDetailPresenter;
+    private boolean noImagesMode;
+    private boolean nightMode;
 
     @Bind(R.id.toolbar)
     Toolbar toolbar;
@@ -59,14 +59,6 @@ public class DetailActivity extends AppCompatActivity implements IDeatilView {
     @Bind(R.id.appBarLayout)
     AppBarLayout appBarLayout;
 
-
-    private boolean noImagesMode;
-
-    private boolean nightMode;
-
-//    @Bind(R.id.progress)
-//    ProgressBar progress;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -78,7 +70,14 @@ protected void onCreate(Bundle savedInstanceState) {
         nightMode = preferences.getBoolean("dayNightMode", false);
         initView();
         iDetailPresenter = new DetailPresenterCompl(this);
-        iDetailPresenter.requestNewsContent(id);
+        String cache = new CacheUtil(this).loadCache(String.valueOf(id));
+        if (cache == null || "".equals(cache)) {
+            iDetailPresenter.requestNewsContent(id);
+        } else {
+            Gson gson = new Gson();
+            ContentEntity entity = gson.fromJson(cache, ContentEntity.class);
+            showContent(entity);
+        }
     }
 
     @Override
@@ -135,15 +134,6 @@ public void showContent(ContentEntity entity) {
         StringBuffer stringBuffer = handleHtml(body);
         webView.setDrawingCacheEnabled(true);
         webView.loadDataWithBaseURL("file:///android_asset/", stringBuffer.toString(), "text/html", "utf-8", null);
-        webView.setWebChromeClient(new WebChromeClient() {
-
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                super.onProgressChanged(view, newProgress);
-                Log.d("DetailActivity", "newProgress:" + newProgress);
-//                progress.setProgress(newProgress);
-            }
-        });
     }
 
     @NonNull
@@ -157,7 +147,6 @@ private StringBuffer handleHtml(String body) {
     }
 
     private void webviewSettings(WebSettings settings) {
-        settings.setJavaScriptEnabled(true);
         settings.setDatabaseEnabled(true);
 
         if (noImagesMode) {
@@ -176,18 +165,18 @@ private void webviewSettings(WebSettings settings) {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-//        getMenuInflater().inflate(R.menu.main, menu);
+        //        getMenuInflater().inflate(R.menu.main, menu);
         return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int itemId = item.getItemId();
 
-//        if (itemId == R.id.action_share) {
-//            share();
-//            return true;
-//        }
+        //        if (itemId == R.id.action_share) {
+        //            share();
+        //            return true;
+        //        }
 
         return super.onOptionsItemSelected(item);
     }

app/src/main/java/com/tneciv/zhihudaily/theme/presenter/ThemePresenterCompl.java

@@ -1,5 +1,7 @@
 package com.tneciv.zhihudaily.theme.presenter;
 
+import android.content.Context;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
@@ -9,7 +11,7 @@
 import com.tneciv.zhihudaily.costants.ErrorEntity;
 import com.tneciv.zhihudaily.theme.model.ThemeEntity;
 import com.tneciv.zhihudaily.theme.model.ThemeResultEntity;
-import com.tneciv.zhihudaily.theme.view.IThemeView;
+import com.tneciv.zhihudaily.utils.CacheUtil;
 import com.tneciv.zhihudaily.utils.OkhttpUtil;
 
 import java.io.IOException;
@@ -27,10 +29,11 @@
  * Created by Tneciv on 1-31-0031.
  */
 public class ThemePresenterCompl implements IThemePresenter {
-    private IThemeView iThemeView;
 
-    public ThemePresenterCompl(IThemeView iThemeView) {
-        this.iThemeView = iThemeView;
+    private Context mContext;
+
+    public ThemePresenterCompl(Context context) {
+        this.mContext = context;
     }
 
     @Override
@@ -46,14 +49,15 @@ public void onFailure(Call call, IOException e) {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 String string = response.body().string();
+                new CacheUtil(mContext).cacheFiles(url, string);
                 handleResponse(string, url);
             }
         });
     }
 
     private void handleResponse(String response, String url) {
         Gson gson = new Gson();
-        if (url == ZhihuApi.THEME_LIST) {
+        if (url.equals(ZhihuApi.THEME_LIST)) {
             Type type = new TypeToken<List<ThemeEntity>>() {
             }.getType();
             List<ThemeEntity> themeEntities = new ArrayList<>();

app/src/main/java/com/tneciv/zhihudaily/theme/view/ThemeFragment.java

@@ -38,7 +38,7 @@ public ThemeFragment() {
     @Override
     public void init() {
         boolean isNightMode = config.getBoolean("dayNightMode", false);
-        iThemePresenter = new ThemePresenterCompl(this);
+        iThemePresenter = new ThemePresenterCompl(getContext());
         adapter = new ThemeRecyclerAdapter(getContext(), entities, isNightMode);
         recyclerView.setAdapter(adapter);
     }

app/src/main/java/com/tneciv/zhihudaily/utils/CacheUtil.java

@@ -18,7 +18,7 @@
 public class CacheUtil {
     public static final int APP_VERSION = 1;
     public static final int VALUE_COUNT = 1;
-    public static final long MAX_SIZE = 10 * 1024 * 1024;
+    public static final long MAX_SIZE = 30 * 1024 * 1024;
 
     private Context mContext;