diff options
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java index 94ead554..f29a7745 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/SimpleLoginManager.java @@ -17,11 +17,9 @@ public abstract class SimpleLoginManager { private final int m_requestId; protected String m_sessionId; protected int m_apiLevel; - protected Context m_context; public LoginRequest(Context context, int requestId) { super(context); - m_context = context; m_requestId = requestId; } @@ -34,33 +32,18 @@ public abstract class SimpleLoginManager { if (content != null) { m_sessionId = content.get("session_id").getAsString(); - Log.d(TAG, "[SLM] Authenticated!"); + // Extract api_level from login response directly + // (works for both v1 and v2 login responses) + JsonElement apiLevelEl = content.get("api_level"); + if (apiLevelEl != null) { + m_apiLevel = apiLevelEl.getAsInt(); + } else { + m_apiLevel = 0; + } - ApiRequest req = new ApiRequest(m_context) { - protected void onPostExecute(JsonElement result) { - m_apiLevel = 0; - - if (result != null) { - try { - m_apiLevel = result.getAsJsonObject() - .get("level").getAsInt(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - Log.d(TAG, "[SLM] Received API level: " + m_apiLevel); - - onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); - } - }; - - HashMap<String, String> map = new HashMap<>(); - map.put("sid", m_sessionId); - map.put("op", "getApiLevel"); - - req.execute(map); + Log.d(TAG, "[SLM] Authenticated! api_level=" + m_apiLevel); + onLoginSuccess(m_requestId, m_sessionId, m_apiLevel); return; } |
