summaryrefslogtreecommitdiff
path: root/src/org/fox/ttrss/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/fox/ttrss/MainActivity.java')
-rw-r--r--src/org/fox/ttrss/MainActivity.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index fb16a3d3..9f5b88f8 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -490,8 +490,10 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
} catch (Exception e) {
e.printStackTrace();
}
+ } else {
+ setLoadingStatus(R.string.login_no_data, false);
}
- }
+ }
}
@Override
@@ -601,7 +603,8 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
LoginRequest ar = new LoginRequest();
ar.setApi(m_prefs.getString("ttrss_url", null));
-
+ ar.setTrustAny(m_prefs.getBoolean("ssl_trust_any", false));
+
HashMap<String,String> map = new HashMap<String,String>() {
{
put("op", "login");