summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-09-01 22:26:32 +0400
committerAndrew Dolgov <[email protected]>2012-09-01 22:26:32 +0400
commit0717b1d38fa0296d04cdb0ee168cec004059797b (patch)
tree728bac79914d24a5ebe734bbc380a5301fcb7cda /src
parentb826481001889868a57fb37b80fcfd7b109ab1a8 (diff)
revert to old way of handling LOGIN_FAILED in subfragments
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/FeedCategoriesFragment.java2
-rw-r--r--src/org/fox/ttrss/FeedsFragment.java2
-rw-r--r--src/org/fox/ttrss/HeadlinesFragment.java2
-rw-r--r--src/org/fox/ttrss/MainActivity.java2
-rw-r--r--src/org/fox/ttrss/OnlineServices.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/org/fox/ttrss/FeedCategoriesFragment.java b/src/org/fox/ttrss/FeedCategoriesFragment.java
index 3316fb6a..055659ca 100644
--- a/src/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/src/org/fox/ttrss/FeedCategoriesFragment.java
@@ -233,7 +233,7 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
}
if (m_lastError == ApiError.LOGIN_FAILED) {
- m_onlineServices.restart();
+ m_onlineServices.login();
} else {
setLoadingStatus(getErrorMessage(), false);
}
diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java
index 01d60609..030005fe 100644
--- a/src/org/fox/ttrss/FeedsFragment.java
+++ b/src/org/fox/ttrss/FeedsFragment.java
@@ -347,7 +347,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
}
if (m_lastError == ApiError.LOGIN_FAILED) {
- m_onlineServices.restart();
+ m_onlineServices.login();
} else {
setLoadingStatus(getErrorMessage(), false);
}
diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java
index 8e861667..c8d0ce2d 100644
--- a/src/org/fox/ttrss/HeadlinesFragment.java
+++ b/src/org/fox/ttrss/HeadlinesFragment.java
@@ -319,7 +319,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}
if (m_lastError == ApiError.LOGIN_FAILED) {
- m_onlineServices.restart();
+ m_onlineServices.login();
} else {
setLoadingStatus(getErrorMessage(), false);
}
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 6f4f4348..bb8620af 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -1903,6 +1903,7 @@ public class MainActivity extends CommonActivity implements OnlineServices {
initMainMenu();
}
+ @Override
@SuppressWarnings({ "unchecked", "serial" })
public void login() {
@@ -2256,7 +2257,6 @@ public class MainActivity extends CommonActivity implements OnlineServices {
initMainMenu();
}
- @Override
public void restart() {
Intent refresh = new Intent(MainActivity.this, MainActivity.class);
refresh.putExtra("sessionId", m_sessionId);
diff --git a/src/org/fox/ttrss/OnlineServices.java b/src/org/fox/ttrss/OnlineServices.java
index 32399831..112f9722 100644
--- a/src/org/fox/ttrss/OnlineServices.java
+++ b/src/org/fox/ttrss/OnlineServices.java
@@ -20,7 +20,7 @@ public interface OnlineServices {
public void onArticleListSelectionChange(ArticleList selection);
//public void initMainMenu();
- public void restart();
+ public void login();
public String getSessionId();
public boolean isSmallScreen();
public boolean getUnreadOnly();