From 609ab8eb30822441044d6574c6f7c24ca0569a94 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 3 Feb 2016 20:40:04 +0300
Subject: initialize UIL in CommonActivity

---
 .../main/java/org/fox/ttrss/CommonActivity.java    | 24 ++++++++++++++++++++++
 .../main/java/org/fox/ttrss/OnlineActivity.java    | 17 ---------------
 2 files changed, 24 insertions(+), 17 deletions(-)

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
index 4cada7e0..a8536555 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
@@ -31,11 +31,18 @@ import android.widget.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.nostra13.universalimageloader.cache.disc.impl.ext.LruDiscCache;
+import com.nostra13.universalimageloader.core.DefaultConfigurationFactory;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+
 import org.fox.ttrss.util.DatabaseHelper;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Arrays;
 
 public class CommonActivity extends ActionBarActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -160,6 +167,23 @@ public class CommonActivity extends ActionBarActivity implements SharedPreferenc
 
 		CustomTabsClient.bindCustomTabsService(this, "com.android.chrome", m_customTabServiceConnection);
 
+		if (!ImageLoader.getInstance().isInited()) {
+			ImageLoaderConfiguration config;
+
+			try {
+				config = new ImageLoaderConfiguration.Builder(getApplicationContext())
+						.diskCache(
+								new LruDiscCache(new File(getCacheDir(), "article-images"),
+										DefaultConfigurationFactory.createFileNameGenerator(),
+										100 * 1024 * 1024))
+						.build();
+			} catch (IOException e) {
+				config = new ImageLoaderConfiguration.Builder(getApplicationContext())
+						.build();
+			}
+			ImageLoader.getInstance().init(config);
+		}
+
 		super.onCreate(savedInstanceState);
 	}
 
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 3fe59aff..355c5a58 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -168,23 +168,6 @@ public class OnlineActivity extends CommonActivity {
 		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
 
-        if (!ImageLoader.getInstance().isInited()) {
-			ImageLoaderConfiguration config;
-
-			try {
-				config = new ImageLoaderConfiguration.Builder(getApplicationContext())
-						.diskCache(
-								new LruDiscCache(new File(getCacheDir(), "article-images"),
-										DefaultConfigurationFactory.createFileNameGenerator(),
-										100 * 1024 * 1024))
-						.build();
-			} catch (IOException e) {
-				config = new ImageLoaderConfiguration.Builder(getApplicationContext())
-						.build();
-			}
-            ImageLoader.getInstance().init(config);
-        }
-
 		//m_pullToRefreshAttacher = PullToRefreshAttacher.get(this);
 
 		if (isOffline) {
-- 
cgit v1.2.3