From 581f79b3c1fc3942032685aee7943d7ea97aecfd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 Dec 2011 14:46:15 +0300 Subject: menu updates, bump version, misc cleanup --- src/org/fox/ttrss/ArticleFragment.java | 1 - src/org/fox/ttrss/DatabaseHelper.java | 1 + src/org/fox/ttrss/FeedCategoriesFragment.java | 2 -- src/org/fox/ttrss/FeedsFragment.java | 3 +-- src/org/fox/ttrss/HeadlinesFragment.java | 8 -------- src/org/fox/ttrss/OfflineActivity.java | 22 ++-------------------- src/org/fox/ttrss/OfflineHeadlinesFragment.java | 2 -- 7 files changed, 4 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index bbbc5dfa..88ac7a9a 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -7,7 +7,6 @@ import org.fox.ttrss.ArticleOps.RelativeArticle; import android.app.Activity; import android.content.SharedPreferences; -import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; diff --git a/src/org/fox/ttrss/DatabaseHelper.java b/src/org/fox/ttrss/DatabaseHelper.java index dbdf110a..71020078 100644 --- a/src/org/fox/ttrss/DatabaseHelper.java +++ b/src/org/fox/ttrss/DatabaseHelper.java @@ -7,6 +7,7 @@ import android.provider.BaseColumns; public class DatabaseHelper extends SQLiteOpenHelper { + @SuppressWarnings("unused") private final String TAG = this.getClass().getSimpleName(); public static final String DATABASE_NAME = "OfflineStorage.db"; public static final int DATABASE_VERSION = 2; diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java index 100826c4..7d700f42 100644 --- a/src/org/fox/ttrss/FeedCategoriesFragment.java +++ b/src/org/fox/ttrss/FeedCategoriesFragment.java @@ -14,11 +14,9 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index fa160d93..6406d30e 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -39,11 +39,10 @@ import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.util.Log; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.ContextMenu.ContextMenuInfo; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index ac4797b2..a3e50b73 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -1,9 +1,6 @@ package org.fox.ttrss; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Type; -import java.net.MalformedURLException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -12,9 +9,6 @@ import java.util.HashMap; import java.util.List; import java.util.TimeZone; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; import org.jsoup.Jsoup; import android.app.Activity; @@ -22,13 +16,11 @@ import android.content.Context; import android.content.SharedPreferences; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.os.AsyncTask; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.text.Html; import android.text.Html.ImageGetter; -import android.text.Spanned; import android.text.method.LinkMovementMethod; import android.util.Log; import android.view.ContextMenu; diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java index 325bfcbc..5a000ed9 100644 --- a/src/org/fox/ttrss/OfflineActivity.java +++ b/src/org/fox/ttrss/OfflineActivity.java @@ -1,25 +1,15 @@ package org.fox.ttrss; -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; - import org.fox.ttrss.ArticleOps.RelativeArticle; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.PackageInfo; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteStatement; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.os.Bundle; import android.preference.PreferenceManager; import android.provider.BaseColumns; @@ -37,12 +27,6 @@ import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.LinearLayout; import android.widget.TextView; -import com.google.ads.c; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.reflect.TypeToken; - public class OfflineActivity extends FragmentActivity { private final String TAG = this.getClass().getSimpleName(); @@ -110,9 +94,6 @@ public class OfflineActivity extends FragmentActivity { new TransitionHelper((LinearLayout)findViewById(R.id.main)); } - List pkgs = getPackageManager().getInstalledPackages(0); - - initMainMenu(); findViewById(R.id.loading_container).setVisibility(View.INVISIBLE); @@ -529,7 +510,8 @@ public class OfflineActivity extends FragmentActivity { findViewById(R.id.article_fragment).setVisibility(View.GONE); findViewById(R.id.headlines_fragment).setVisibility(View.VISIBLE); } else { - findViewById(R.id.article_fragment).setVisibility(View.GONE); + findViewById(R.id.article_fragment).setVisibility(View.GONE); + findViewById(R.id.feeds_fragment).setVisibility(View.VISIBLE); } diff --git a/src/org/fox/ttrss/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/OfflineHeadlinesFragment.java index bd689d88..ed28c320 100644 --- a/src/org/fox/ttrss/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/OfflineHeadlinesFragment.java @@ -2,9 +2,7 @@ package org.fox.ttrss; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.TimeZone; import org.jsoup.Jsoup; -- cgit v1.2.3-54-g00ecf