switch widget provider to use simpleloginmanager

This commit is contained in:
Andrew Dolgov 2013-10-17 16:41:45 +04:00
parent 68f8880a61
commit c79080545c

View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import org.fox.ttrss.ApiRequest; import org.fox.ttrss.ApiRequest;
import org.fox.ttrss.R; import org.fox.ttrss.R;
import org.fox.ttrss.util.SimpleLoginManager;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -64,72 +65,69 @@ public class WidgetUpdateService extends Service {
} else { } else {
ApiRequest ar = new ApiRequest(getApplicationContext()) { SimpleLoginManager loginManager = new SimpleLoginManager() {
@SuppressWarnings({ "unchecked", "serial" })
@Override @Override
protected void onPostExecute(JsonElement result) { protected void onLoginSuccess(int requestId, String sessionId, int apiLevel) {
if (result != null) {
JsonObject content = result.getAsJsonObject();
if (content != null) { ApiRequest aru = new ApiRequest(getApplicationContext()) {
final String sessionId = content.get("session_id").getAsString(); @Override
protected void onPostExecute(JsonElement result) {
if (result != null) {
try {
JsonObject content = result.getAsJsonObject();
ApiRequest aru = new ApiRequest(getApplicationContext()) { if (content != null) {
@Override int unread = content.get("unread").getAsInt();
protected void onPostExecute(JsonElement result) {
if (result != null) {
try {
JsonObject content = result.getAsJsonObject();
if (content != null) { view.setViewVisibility(R.id.progress, View.GONE);
int unread = content.get("unread").getAsInt(); view.setTextViewText(R.id.counter, String.valueOf(unread));
manager.updateAppWidget(thisWidget, view);
view.setViewVisibility(R.id.progress, View.GONE); return;
view.setTextViewText(R.id.counter, String.valueOf(unread)); }
manager.updateAppWidget(thisWidget, view); } catch (Exception e) {
e.printStackTrace();
}
}
return; view.setViewVisibility(R.id.progress, View.GONE);
} view.setTextViewText(R.id.counter, "?");
} catch (Exception e) { manager.updateAppWidget(thisWidget, view);
e.printStackTrace(); }
} };
}
view.setViewVisibility(R.id.progress, View.GONE); final String fSessionId = sessionId;
view.setTextViewText(R.id.counter, "?");
manager.updateAppWidget(thisWidget, view);
}
};
HashMap<String, String> umap = new HashMap<String, String>() { HashMap<String, String> umap = new HashMap<String, String>() {
{ {
put("op", "getUnread"); put("op", "getUnread");
put("sid", sessionId); put("sid", fSessionId);
} }
}; };
aru.execute(umap); aru.execute(umap);
return; }
}
}
// Toast: login failed @Override
protected void onLoginFailed(int requestId) {
view.setViewVisibility(R.id.progress, View.GONE); view.setViewVisibility(R.id.progress, View.GONE);
view.setTextViewText(R.id.counter, "?"); view.setTextViewText(R.id.counter, "?");
manager.updateAppWidget(thisWidget, view); manager.updateAppWidget(thisWidget, view);
}; }
};
HashMap<String, String> map = new HashMap<String, String>() { @Override
{ protected void onLoggingIn(int requestId) {
put("op", "login");
put("user", m_prefs.getString("login", "").trim());
put("password", m_prefs.getString("password", "").trim());
}
};
ar.execute(map);
}
};
String login = m_prefs.getString("login", "").trim();
String password = m_prefs.getString("password", "").trim();
loginManager.logIn(getApplicationContext(), 1, login, password);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();