flush

evilbunny2008 · Apr 1, 2018 · 24a5d05 · 24a5d05
1 parent 6a957f0
commit 24a5d05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/java/com/odiousapps/weewxweather/GifImageView.java b/app/src/main/java/com/odiousapps/weewxweather/GifImageView.java
@@ -100,7 +100,7 @@ protected void onDraw(Canvas canvas)
         }
     }
 
-    public void setGifBitmap(String filename)
+    public void setGifFromFile(String filename)
     {
         File file = new File(filename);
         try

diff --git a/app/src/main/java/com/odiousapps/weewxweather/Weather.java b/app/src/main/java/com/odiousapps/weewxweather/Weather.java
@@ -11,7 +11,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import java.io.File;
@@ -100,7 +99,7 @@ public boolean onLongClick(View v)
         });
 
         if(new File(common.context.getFilesDir() + "/radar.gif").exists())
-            gif.setGifBitmap(common.context.getFilesDir() + "/radar.gif");
+            gif.setGifFromFile(common.context.getFilesDir() + "/radar.gif");
 
         reloadWebView();
 
@@ -124,6 +123,10 @@ private void reloadWebView()
         Common.LogMessage("reload radar...");
         final String radar = common.GetStringPref("RADAR_URL", "");
 
+        if(radar.equals(""))
+            return;
+
+
         Thread t = new Thread(new Runnable()
         {
             @Override
@@ -183,7 +186,7 @@ public void handleMessage(Message msg)
         {
             try
             {
-                gif.setGifBitmap(common.context.getFilesDir() + "/radar.gif");
+                gif.setGifFromFile(common.context.getFilesDir() + "/radar.gif");
             } catch (Exception e) {
                 e.printStackTrace();
             }