From b100fb6ec1f64d1b88cb1309fffba179741cbe10 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 18 Sep 2012 13:16:03 +0400
Subject: add menu entry to refresh headlines in small screen mode

---
 res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 34085feb..bf475012 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,7 +24,7 @@
     <string name="loading_message">Loading, please wait…</string>
     <string name="menu_unread_feeds">Show unread feeds</string>
     <string name="menu_all_feeds">Show all feeds</string>
-    <string name="update_feeds">Refresh feeds</string>
+    <string name="update_feeds">Refresh</string>
     <string name="share_article">Share article</string>
     <string name="catchup">Mark read</string>
     <string name="sort_feeds_by_unread">Sort feeds by unread count</string>
@@ -128,4 +128,5 @@
     <string name="notify_article_published">Article published</string>
     <string name="notify_article_unpublished">Article unpublished</string>
     <string name="notify_article_note_set">Article note saved</string>
+    <string name="update_headlines">Refresh</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf


From 8f88419419f9e12c5c1ad1aeaff10e3c3457f07d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 19 Sep 2012 09:45:03 +0400
Subject: add enclosure url share button

---
 res/layout/article_fragment.xml        |  7 +++++++
 res/values/strings.xml                 |  1 +
 src/org/fox/ttrss/ApiRequest.java      | 18 ++++++++++--------
 src/org/fox/ttrss/ArticleFragment.java | 20 +++++++++++++++++++-
 src/org/fox/ttrss/OnlineActivity.java  | 10 ++++++++++
 5 files changed, 47 insertions(+), 9 deletions(-)

(limited to 'res/values')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index e46de546..cbcf672d 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -82,6 +82,13 @@
                 android:layout_weight="0"
                 android:text="@string/attachment_view" />
 
+            <Button
+                android:id="@+id/attachment_share"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:text="@string/attachment_share" />
+            
             <Button
                 android:id="@+id/attachment_copy"
                 android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf475012..f777c2e6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -129,4 +129,5 @@
     <string name="notify_article_unpublished">Article unpublished</string>
     <string name="notify_article_note_set">Article note saved</string>
     <string name="update_headlines">Refresh</string>
+    <string name="attachment_share">Share</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java
index ee510987..c1c85e39 100644
--- a/src/org/fox/ttrss/ApiRequest.java
+++ b/src/org/fox/ttrss/ApiRequest.java
@@ -42,7 +42,8 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 	private String m_api;
 	private boolean m_trustAny = false;
 	private boolean m_transportDebugging = false;
-	protected int m_httpStatusCode = 0;
+	protected int m_responseCode = 0;
+	protected String m_responseMessage;
 	protected int m_apiStatusCode = 0;
 	protected Context m_context;
 	private SharedPreferences m_prefs;
@@ -154,10 +155,11 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 		    out.write(postData);
 		    out.close();
 
-		    m_httpStatusCode = conn.getResponseCode();
+		    m_responseCode = conn.getResponseCode();
+		    m_responseMessage = conn.getResponseMessage();
 
-		    switch (m_httpStatusCode) {
-			case 200:
+		    switch (m_responseCode) {
+			case HttpURLConnection.HTTP_OK:
 				BufferedReader buffer = new BufferedReader(
 						new InputStreamReader(conn.getInputStream()), 8192);
 	
@@ -201,16 +203,16 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 				}
 
 				return null;
-			case 401:
+			case HttpURLConnection.HTTP_UNAUTHORIZED:
 				m_lastError = ApiError.HTTP_UNAUTHORIZED;
 				break;
-			case 403:
+			case HttpURLConnection.HTTP_FORBIDDEN:
 				m_lastError = ApiError.HTTP_FORBIDDEN;
 				break;
-			case 404:
+			case HttpURLConnection.HTTP_NOT_FOUND:
 				m_lastError = ApiError.HTTP_NOT_FOUND;
 				break;
-			case 500:
+			case HttpURLConnection.HTTP_INTERNAL_ERROR:
 				m_lastError = ApiError.HTTP_SERVER_ERROR;
 				break;
 			default:
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 429cc7f6..d001fc8f 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -214,7 +214,7 @@ public class ArticleFragment extends Fragment {
 								String strUrl = url.toString().trim();
 								
 								if (a.content_type.indexOf("image") != -1 && !articleContent.contains(strUrl)) {
-									content += "<br/><img src=\"" + strUrl.replace("\"", "\\\"") + "\">";
+									content += "<p><img src=\"" + strUrl.replace("\"", "\\\"") + "\"></p>";
 								}
 								
 								spinnerArray.add(a);
@@ -256,7 +256,25 @@ public class ArticleFragment extends Fragment {
 							}
 						}
 					});
+
+					Button attachmentsShare = (Button) view.findViewById(R.id.attachment_share);
 					
+					if (!m_activity.isPortrait()) {
+						attachmentsShare.setOnClickListener(new OnClickListener() {
+							
+							@Override
+							public void onClick(View v) {
+								Attachment attachment = (Attachment) spinner.getSelectedItem();
+	
+								if (attachment != null) {
+									m_activity.shareText(attachment.content_url);
+								}
+							}
+						});
+					} else {
+						attachmentsShare.setVisibility(View.GONE);
+					}
+
 				} else {
 					view.findViewById(R.id.attachments_holder).setVisibility(View.GONE);
 				}
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 63429465..65da3d61 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -964,6 +964,16 @@ public class OnlineActivity extends CommonActivity {
 		return tmp.replaceAll(",$", "");
 	}
 	
+	public void shareText(String text) {
+
+		Intent intent = new Intent(Intent.ACTION_SEND);
+
+		intent.setType("text/plain");
+		intent.putExtra(Intent.EXTRA_TEXT, text);
+
+		startActivity(Intent.createChooser(intent, text));
+	}
+	
 	public void shareArticle(Article article) {
 		if (article != null) {
 
-- 
cgit v1.2.3-54-g00ecf


From 9fb03a43f1d19569fbe67aad744ea6eb17e083d6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 19 Sep 2012 13:14:50 +0400
Subject: handle unavailable network properly

---
 res/values/strings.xml            |  1 +
 src/org/fox/ttrss/ApiRequest.java | 25 ++++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index f777c2e6..84fd1ed5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -130,4 +130,5 @@
     <string name="notify_article_note_set">Article note saved</string>
     <string name="update_headlines">Refresh</string>
     <string name="attachment_share">Share</string>
+    <string name="error_network_unavailable">Error: network unavailable</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/ApiRequest.java b/src/org/fox/ttrss/ApiRequest.java
index c1c85e39..afb84525 100644
--- a/src/org/fox/ttrss/ApiRequest.java
+++ b/src/org/fox/ttrss/ApiRequest.java
@@ -19,6 +19,8 @@ import java.security.cert.X509Certificate;
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.preference.PreferenceManager;
@@ -34,7 +36,8 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 	private final String TAG = this.getClass().getSimpleName();
 
 	public enum ApiError { NO_ERROR, HTTP_UNAUTHORIZED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, 
-		HTTP_SERVER_ERROR, HTTP_OTHER_ERROR, SSL_REJECTED, PARSE_ERROR, IO_ERROR, OTHER_ERROR, API_DISABLED, API_UNKNOWN, LOGIN_FAILED, INVALID_URL, INCORRECT_USAGE };
+		HTTP_SERVER_ERROR, HTTP_OTHER_ERROR, SSL_REJECTED, PARSE_ERROR, IO_ERROR, OTHER_ERROR, API_DISABLED, 
+		API_UNKNOWN, LOGIN_FAILED, INVALID_URL, INCORRECT_USAGE, NETWORK_UNAVAILABLE };
 	
 	public static final int API_STATUS_OK = 0;
 	public static final int API_STATUS_ERR = 1;
@@ -94,6 +97,8 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 			return R.string.error_invalid_api_url;
 		case INCORRECT_USAGE:
 			return R.string.error_api_incorrect_usage;
+		case NETWORK_UNAVAILABLE:
+			return R.string.error_network_unavailable;
 		default:
 			Log.d(TAG, "getErrorMessage: unknown error code=" + m_lastError);
 			return R.string.error_unknown;
@@ -103,6 +108,11 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 	@Override
 	protected JsonElement doInBackground(HashMap<String, String>... params) {
 
+		if (!isNetworkAvailable()) {
+			m_lastError = ApiError.NETWORK_UNAVAILABLE;
+			return null;
+		}
+		
 		Gson gson = new Gson();
 		
 		String requestStr = gson.toJson(new HashMap<String,String>(params[0]));
@@ -282,4 +292,17 @@ public class ApiRequest extends AsyncTask<HashMap<String,String>, Integer, JsonE
 	        System.setProperty("http.keepAlive", "false");
 	    }
 	}
+	
+	protected boolean isNetworkAvailable() {
+	    ConnectivityManager cm = (ConnectivityManager) 
+	      m_context.getSystemService(Context.CONNECTIVITY_SERVICE);
+	    NetworkInfo networkInfo = cm.getActiveNetworkInfo();
+	    
+	    // if no network is available networkInfo will be null
+	    // otherwise check if we are connected
+	    if (networkInfo != null && networkInfo.isConnected()) {
+	        return true;
+	    }
+	    return false;
+	} 
 }
-- 
cgit v1.2.3-54-g00ecf


From d70e6463ad7d48a24ede3da7ca98d675823e9999 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 19 Sep 2012 16:59:08 +0400
Subject: implement default browsing of articles

---
 res/menu/category_menu.xml                    |  4 ++++
 res/menu/feed_menu.xml                        |  8 +++++++
 res/values/arrays.xml                         | 10 ++++++++-
 res/values/strings.xml                        |  3 +++
 res/xml/preferences.xml                       |  9 ++++++++
 src/org/fox/ttrss/ArticlePager.java           | 14 +++++++++++--
 src/org/fox/ttrss/FeedCategoriesFragment.java | 19 ++++++++++++++++-
 src/org/fox/ttrss/FeedsActivity.java          | 27 ++++++++++++++++--------
 src/org/fox/ttrss/FeedsFragment.java          | 30 +++++++++++++++++++++++++--
 9 files changed, 109 insertions(+), 15 deletions(-)

(limited to 'res/values')

diff --git a/res/menu/category_menu.xml b/res/menu/category_menu.xml
index a1e5f81b..69f26554 100644
--- a/res/menu/category_menu.xml
+++ b/res/menu/category_menu.xml
@@ -1,5 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/browse_headlines"
+        android:title="@string/category_browse_headlines"/>
+    
     <item
         android:id="@+id/browse_articles"
         android:title="@string/category_browse_articles"/>
diff --git a/res/menu/feed_menu.xml b/res/menu/feed_menu.xml
index ff58a881..df8e4862 100644
--- a/res/menu/feed_menu.xml
+++ b/res/menu/feed_menu.xml
@@ -1,5 +1,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/browse_headlines"
+        android:title="@string/category_browse_headlines"/>
+    
+    <item
+        android:id="@+id/browse_articles"
+        android:title="@string/category_browse_articles"/>
+    
     <item
         android:id="@+id/catchup_feed"
         android:title="@string/catchup"/>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index ef479753..961bd955 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -17,5 +17,13 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-
+    <string-array name="pref_view_mode_names">
+        <item>@string/category_browse_headlines</item>
+        <item>@string/category_browse_articles</item>
+    </string-array>
+    <string-array name="pref_view_mode_values">
+        <item>HEADLINES</item>
+        <item>ARTICLES</item>
+    </string-array>
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84fd1ed5..fec2ef4c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -131,4 +131,7 @@
     <string name="update_headlines">Refresh</string>
     <string name="attachment_share">Share</string>
     <string name="error_network_unavailable">Error: network unavailable</string>
+    <string name="category_browse_headlines">Browse headlines</string>
+    <string name="pref_default_view_mode">Default feed view</string>
+    <string name="pref_default_view_mode_long">Which feed view to open by default on smartphones</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d2bae786..400d8a6d 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -98,6 +98,15 @@
             android:defaultValue="true"
             android:key="justify_article_text"
             android:title="@string/justify_article_text" />
+        
+        <ListPreference
+            android:defaultValue="HEADLINES"
+            android:entries="@array/pref_view_mode_names"
+            android:entryValues="@array/pref_view_mode_values"
+            android:key="default_view_mode"
+            android:summary="@string/pref_default_view_mode_long"
+            android:title="@string/pref_default_view_mode" />
+        
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/offline_mode" >
diff --git a/src/org/fox/ttrss/ArticlePager.java b/src/org/fox/ttrss/ArticlePager.java
index 35779843..0608679b 100644
--- a/src/org/fox/ttrss/ArticlePager.java
+++ b/src/org/fox/ttrss/ArticlePager.java
@@ -104,10 +104,11 @@ public class ArticlePager extends Fragment {
 				if (article != null) {
 					m_article = article;
 					
-					if (article.unread) {
+					/* if (article.unread) {
 						article.unread = false;
 						m_activity.saveArticleUnread(article);
-					}
+					} */
+					
 					m_listener.onArticleSelected(article, false);
 					
 					//Log.d(TAG, "Page #" + position + "/" + m_adapter.getCount());
@@ -147,6 +148,15 @@ public class ArticlePager extends Fragment {
 				
 				if (result != null) {				
 					m_adapter.notifyDataSetChanged();
+					
+					if (m_article.id == 0) {
+						if (m_articles.size() > 0) {
+							Log.d(TAG, "blank id on refresh");
+							m_article = m_articles.get(0);
+							m_listener.onArticleSelected(m_article, false);
+						}
+					}
+					
 				} else {
 					if (m_lastError == ApiError.LOGIN_FAILED) {
 						m_activity.login();
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 64561cf9..ac5c0046 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -92,6 +92,15 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 		
 		switch (item.getItemId()) {
 		case R.id.browse_articles:
+			if (true) {
+				FeedCategory cat = getCategoryAtPosition(info.position);
+				if (cat != null) {
+					m_activity.openFeedArticles(new Feed(cat.id, cat.title, true));
+					//setSelectedCategory(cat);
+				}
+			}
+			return true;		
+		case R.id.browse_headlines:
 			if (true) {
 				FeedCategory cat = getCategoryAtPosition(info.position);
 				if (cat != null) {
@@ -392,7 +401,15 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 		
 		if (list != null) {
 			FeedCategory cat = (FeedCategory)list.getItemAtPosition(position);
-			m_activity.onCatSelected(cat);
+			
+			if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES")) &&
+					m_prefs.getBoolean("browse_cats_like_feeds", false)) {
+				
+				m_activity.openFeedArticles(new Feed(cat.id, cat.title, true));
+				
+			} else {			
+				m_activity.onCatSelected(cat);
+			}
 			
 			if (!m_activity.isSmallScreen())
 				m_selectedCat = cat;
diff --git a/src/org/fox/ttrss/FeedsActivity.java b/src/org/fox/ttrss/FeedsActivity.java
index fd01606c..e1126fe5 100644
--- a/src/org/fox/ttrss/FeedsActivity.java
+++ b/src/org/fox/ttrss/FeedsActivity.java
@@ -68,7 +68,7 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 					
 					ap.setSearchQuery(intent.getStringExtra("searchQuery"));
 					
-					setTitle(intent.getStringExtra("feedTitle"));
+					setTitle(feed.title);
 				} else {
 					if (feed != null) {
 						HeadlinesFragment hf = new HeadlinesFragment(feed);
@@ -136,20 +136,14 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 		}		
 	}
 	
-	
 	public void onFeedSelected(Feed feed) {
 		GlobalState.getInstance().m_loadedArticles.clear();
 
 		if (isSmallScreen()) {
-				
 			Intent intent = new Intent(FeedsActivity.this, FeedsActivity.class);
 			intent.putExtra("feed", feed);
-	 	   
+
 			startActivityForResult(intent, 0);
-			
-			//HeadlinesFragment hf = new HeadlinesFragment(feed);
-			//ft.replace(R.id.feeds_fragment, hf, FRAG_HEADLINES);
-			//ft.addToBackStack(null);
 		} else {
 			FragmentTransaction ft = getSupportFragmentManager()
 					.beginTransaction();
@@ -240,6 +234,22 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 		initMenu();		
 	}
 
+	public void openFeedArticles(Feed feed) {
+		if (isSmallScreen()) {
+			Intent intent = new Intent(FeedsActivity.this, FeedsActivity.class);
+			
+			GlobalState.getInstance().m_activeFeed = feed;
+			GlobalState.getInstance().m_loadedArticles.clear();
+
+			intent.putExtra("feed", feed);
+			intent.putExtra("article", new Article());
+			startActivityForResult(intent, 0);
+			
+		} else {
+			
+		}
+	}
+	
 	public void onArticleSelected(Article article, boolean open) {
 		if (article.unread) {
 			article.unread = false;
@@ -252,7 +262,6 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
 			if (isSmallScreen()) {
 
 				Intent intent = new Intent(FeedsActivity.this, FeedsActivity.class);
-				intent.putExtra("feedTitle", hf.getFeed().title);
 				intent.putExtra("feed", hf.getFeed());
 				intent.putExtra("article", article);
 				intent.putExtra("searchQuery", hf.getSearchQuery());
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 1a82534f..a8284c76 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -20,6 +20,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.Feed;
 import org.fox.ttrss.types.FeedCategory;
 import org.fox.ttrss.types.FeedList;
@@ -136,6 +137,22 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item
 				.getMenuInfo();
 		switch (item.getItemId()) {
+		case R.id.browse_articles:
+			if (true) {
+				Feed feed = getFeedAtPosition(info.position);
+				if (feed != null) {
+					m_activity.openFeedArticles(feed);
+				}
+			}
+			return true;		
+		case R.id.browse_headlines:
+			if (true) {
+				Feed feed = getFeedAtPosition(info.position);
+				if (feed != null) {
+					m_activity.onFeedSelected(feed);
+				}
+			}
+			return true;
 		case R.id.catchup_feed:
 			if (true) {
 				Feed feed = getFeedAtPosition(info.position);
@@ -163,6 +180,11 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 		if (feed != null) 
 			menu.setHeaderTitle(feed.title);
 
+		if (!m_activity.isSmallScreen()) {
+			menu.findItem(R.id.browse_headlines).setVisible(false);
+			menu.findItem(R.id.browse_feeds).setVisible(false);
+		}
+		
 		super.onCreateContextMenu(menu, v, menuInfo);		
 		
 	}
@@ -239,8 +261,12 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 				cat.title = feed.title;
 				
 				m_activity.onCatSelected(cat);				
-			} else {				
-				m_activity.onFeedSelected(feed);
+			} else {
+				if ("ARTICLES".equals(m_prefs.getString("default_view_mode", "HEADLINES"))) {
+					m_activity.openFeedArticles(feed);
+				} else {
+					m_activity.onFeedSelected(feed);
+				}
 			}
 			
 			if (!m_activity.isSmallScreen())
-- 
cgit v1.2.3-54-g00ecf


From 0148a203696a262a8902743848828fe38343b3d1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 19 Sep 2012 22:40:27 +0400
Subject: add donation menu item

---
 res/menu/main_menu.xml                | 60 ++++++++++++++---------------------
 res/values/strings.xml                |  1 +
 src/org/fox/ttrss/OnlineActivity.java | 34 ++++++++++++++++++++
 3 files changed, 58 insertions(+), 37 deletions(-)

(limited to 'res/values')

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 87ebee42..a4d168a5 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -1,7 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <group android:id="@+id/menu_group_logged_in" >
-
         <group android:id="@+id/menu_group_feeds" >
 
             <!--
@@ -17,137 +16,125 @@
                 android:icon="@android:drawable/ic_menu_agenda"
                 android:showAsAction=""
                 android:title="@string/menu_all_feeds"/>
-
             <item
                 android:id="@+id/update_feeds"
                 android:icon="@android:drawable/ic_menu_rotate"
                 android:showAsAction="ifRoom"
                 android:title="@string/update_feeds"/>
-
             <item
                 android:id="@+id/go_offline"
                 android:icon="@drawable/ic_menu_cloud"
                 android:showAsAction=""
                 android:title="@string/go_offline"/>
-
             <item
                 android:id="@+id/logout"
                 android:icon="@drawable/ic_menu_exit"
                 android:showAsAction=""
                 android:title="@string/logout"/>
         </group>
-
         <group android:id="@+id/menu_group_headlines" >
-
             <item
                 android:id="@+id/update_headlines"
                 android:icon="@android:drawable/ic_menu_rotate"
                 android:showAsAction="ifRoom"
-                android:title="@string/update_headlines"/>            
-            
+                android:title="@string/update_headlines"/>
             <item
                 android:id="@+id/search"
                 android:actionViewClass="android.widget.SearchView"
                 android:icon="@android:drawable/ic_menu_search"
                 android:showAsAction="ifRoom|collapseActionView"
                 android:title="@string/search"/>
-
             <item
                 android:id="@+id/headlines_mark_as_read"
                 android:icon="@drawable/ic_menu_tick"
                 android:showAsAction=""
                 android:title="@string/headlines_mark_as_read"/>
-
             <item
                 android:id="@+id/headlines_select"
                 android:icon="@drawable/ic_menu_database"
                 android:showAsAction=""
                 android:title="@string/headlines_select"/>
-            
-            <!--  <item
+
+            <!--
+                  <item
                 android:id="@+id/close_feed"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
-                android:title="@string/close_feed"/> -->
-            
-        </group>
+                android:title="@string/close_feed"/>
+            -->
 
+        </group>
         <group android:id="@+id/menu_group_headlines_selection" >
-
             <item
                 android:id="@+id/selection_toggle_unread"
                 android:icon="@drawable/ic_menu_tick"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_unread"/>
-
             <item
                 android:id="@+id/selection_toggle_marked"
                 android:icon="@drawable/ic_menu_marked"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_marked"/>
-
             <item
                 android:id="@+id/selection_toggle_published"
                 android:icon="@drawable/ic_menu_rss"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_published"/>
-
             <item
                 android:id="@+id/selection_select_none"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
                 android:title="@string/selection_select_none"/>
         </group>
-
         <group android:id="@+id/menu_group_article" >
-
             <item
                 android:id="@+id/toggle_marked"
                 android:icon="@drawable/ic_menu_marked"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
-
             <item
                 android:id="@+id/toggle_published"
                 android:icon="@drawable/ic_menu_rss"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
-
             <item
                 android:id="@+id/share_article"
+                android:actionProviderClass="android.widget.ShareActionProvider"
                 android:icon="@android:drawable/ic_menu_share"
                 android:showAsAction=""
-                android:actionProviderClass="android.widget.ShareActionProvider"
                 android:title="@string/share_article"/>
-                        
             <item
                 android:id="@+id/set_unread"
                 android:icon="@android:drawable/ic_menu_recent_history"
                 android:showAsAction=""
                 android:title="@string/article_set_unread"/>
-
             <item
                 android:id="@+id/catchup_above"
                 android:icon="@drawable/ic_menu_tick"
                 android:title="@string/article_mark_read_above"/>
-
             <item
                 android:id="@+id/set_labels"
                 android:icon="@drawable/ic_menu_marked"
                 android:title="@string/article_set_labels"/>
-            
             <item
-	            android:id="@+id/article_set_note"
-            	android:showAsAction=""
-            	android:title="@string/article_set_note"/>
-            
-            <!--  <item
+                android:id="@+id/article_set_note"
+                android:showAsAction=""
+                android:title="@string/article_set_note"/>
+
+            <!--
+                  <item
                 android:id="@+id/close_article"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
-                android:title="@string/close_article"/> -->
-            
+                android:title="@string/close_article"/>
+            -->
+
         </group>
+
+        <item
+            android:id="@+id/donate"
+            android:showAsAction=""
+            android:title="@string/donate"/>
     </group>
 
     <item
@@ -155,9 +142,8 @@
         android:icon="@android:drawable/ic_menu_preferences"
         android:showAsAction=""
         android:title="@string/preferences"/>
-    
-    <group android:id="@+id/menu_group_logged_out" >
 
+    <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
             android:icon="@android:drawable/ic_menu_rotate"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fec2ef4c..2c766d85 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -134,4 +134,5 @@
     <string name="category_browse_headlines">Browse headlines</string>
     <string name="pref_default_view_mode">Default feed view</string>
     <string name="pref_default_view_mode_long">Which feed view to open by default on smartphones</string>
+    <string name="donate_thanks">Donation found, thank you for support!</string>
 </resources>
\ No newline at end of file
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 7632b622..de3c0de6 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -15,6 +15,7 @@ import org.fox.ttrss.types.Label;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -23,7 +24,9 @@ import android.content.DialogInterface.OnMultiChoiceClickListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -442,6 +445,24 @@ public class OnlineActivity extends CommonActivity {
 		case android.R.id.home:
 			finish();
 			return true;
+		case R.id.donate:
+			if (true) {
+				try {
+					Intent intent = new Intent(Intent.ACTION_VIEW, 
+						Uri.parse("market://details?id=org.fox.ttrss.key"));
+					startActivity(intent);
+				} catch (ActivityNotFoundException ae) {
+					try {
+						Intent intent = new Intent(Intent.ACTION_VIEW, 
+							Uri.parse("https://play.google.com/store/apps/details?id=org.fox.ttrss.key"));
+						startActivity(intent);
+					} catch (Exception e) {
+						e.printStackTrace();
+						toast(R.string.error_other_error);
+					}
+				}
+			}
+			return true;
 		case R.id.logout:
 			logout();
 			return true;
@@ -851,6 +872,19 @@ public class OnlineActivity extends CommonActivity {
 
 		initMenu();
 		
+		List<PackageInfo> pkgs = getPackageManager()
+				.getInstalledPackages(0);
+
+		for (PackageInfo p : pkgs) {
+			if ("org.fox.ttrss.key".equals(p.packageName)) {
+				Log.d(TAG, "license apk found");
+				menu.findItem(R.id.donate).setVisible(false);
+				toast(R.string.donate_thanks);
+				break;
+			}
+		}
+
+		
 		return true;
 	}
 	
-- 
cgit v1.2.3-54-g00ecf