forked from github/szkolny
[Deprecated] Remove ServerRequest, GenericDialog.
This commit is contained in:
Kuba Szczodrzyński
parent
82b232d0e5
commit
f5e1e9fdd9
@ -1,140 +0,0 @@
|
||||
package pl.szczodrzynski.edziennik.network;
|
||||
|
||||
import android.os.Build;
|
||||
import android.os.Looper;
|
||||
import android.provider.Settings;
|
||||
import android.util.Pair;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import im.wangchao.mhttp.Request;
|
||||
import im.wangchao.mhttp.Response;
|
||||
import im.wangchao.mhttp.ThreadMode;
|
||||
import im.wangchao.mhttp.callback.JsonCallbackHandler;
|
||||
import pl.szczodrzynski.edziennik.App;
|
||||
import pl.szczodrzynski.edziennik.BuildConfig;
|
||||
import pl.szczodrzynski.edziennik.data.db.entity.Profile;
|
||||
import pl.szczodrzynski.edziennik.utils.Utils;
|
||||
|
||||
import static pl.szczodrzynski.edziennik.data.db.entity.Profile.REGISTRATION_ENABLED;
|
||||
|
||||
public class ServerRequest {
|
||||
private App app;
|
||||
private String url;
|
||||
private List<Pair<String, Object>> params;
|
||||
private String username = "";
|
||||
private String source = "";
|
||||
|
||||
public ServerRequest(App app, String url, String source) {
|
||||
this(app, url, source, App.Companion.getProfile());
|
||||
}
|
||||
|
||||
public ServerRequest(App app, String url, String source, Profile profileFull) {
|
||||
this(app, url, source, profileFull, profileFull == null ? -1 : profileFull.getLoginStoreType(), profileFull == null ? "" : profileFull.getUserCode());
|
||||
}
|
||||
|
||||
public ServerRequest(App app, String url, String source, Profile profile, int loginStoreType, String usernameId) {
|
||||
this.app = app;
|
||||
this.url = url;
|
||||
this.params = new ArrayList<>();
|
||||
this.username = (profile != null && profile.getRegistration() == REGISTRATION_ENABLED ? usernameId : app.getDeviceId());
|
||||
this.source = source;
|
||||
if (profile != null && profile.getRegistration() == REGISTRATION_ENABLED) {
|
||||
this.setBodyParameter("login_type", Integer.toString(loginStoreType));
|
||||
this.setBodyParameter("name_long", profile.getStudentNameLong());
|
||||
this.setBodyParameter("name_short", profile.getStudentNameShort());
|
||||
//if (Looper.myLooper() == Looper.getMainLooper()) {
|
||||
if (Looper.getMainLooper().getThread() == Thread.currentThread()) {
|
||||
this.setBodyParameter("team_ids", "UI_THREAD");
|
||||
}
|
||||
else {
|
||||
this.setBodyParameter("team_ids", app.getGson().toJson(App.db.teamDao().getAllCodesNow(profile.getId())));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ServerRequest withUsername(String username) {
|
||||
this.username = username;
|
||||
return this;
|
||||
}
|
||||
|
||||
public ServerRequest setBodyParameter(String name, String value) {
|
||||
params.add(new Pair<>(name, value));
|
||||
return this;
|
||||
}
|
||||
|
||||
public interface JsonCallback {
|
||||
void onCallback(Exception e, JsonObject result);
|
||||
}
|
||||
|
||||
private String sign(String signature, long timestamp) {
|
||||
String password = "Y3plZ29fdHVfc3p1a2Fzeg=="+ BuildConfig.VERSION_CODE + timestamp;
|
||||
return Utils.HmacMD5(password, signature);
|
||||
}
|
||||
|
||||
public void run(JsonCallback callback) {
|
||||
long timestamp = System.currentTimeMillis() / 1000;
|
||||
Request.builder()
|
||||
.url(url)
|
||||
.callbackThreadMode(ThreadMode.MAIN)
|
||||
.userAgent("Szkolny.eu/"+BuildConfig.VERSION_NAME+" (Android "+Build.VERSION.RELEASE+"; "+Build.MANUFACTURER+" "+Build.MODEL+")")
|
||||
.addParams(params)
|
||||
.addParameter("username", username)
|
||||
.addParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
|
||||
.addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
|
||||
.addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
|
||||
.addParameter("device_id", Settings.Secure.getString(app.getContentResolver(), Settings.Secure.ANDROID_ID))
|
||||
.addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
|
||||
.addParameter("device_os_version", Build.VERSION.RELEASE)
|
||||
.addParameter("fcm_token", app.getConfig().getSync().getTokenApp())
|
||||
.addParameter("signature", "TODO")
|
||||
.addParameter("signature_timestamp", timestamp)
|
||||
.addParameter("package_name", "pl.szczodrzynski.edziennik")
|
||||
.addParameter("source", source)
|
||||
.addParameter("update_frequency", app.getConfig().getSync().getEnabled() ? app.getConfig().getSync().getInterval() : -1)
|
||||
.post()
|
||||
.callback(new JsonCallbackHandler() {
|
||||
@Override
|
||||
public void onSuccess(JsonObject data, im.wangchao.mhttp.Response response) {
|
||||
super.onSuccess(data, response);
|
||||
callback.onCallback(null, data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFailure(im.wangchao.mhttp.Response response, Throwable throwable) {
|
||||
super.onFailure(response, throwable);
|
||||
callback.onCallback(throwable instanceof Exception ? (Exception) throwable : null, null);
|
||||
}
|
||||
})
|
||||
.build()
|
||||
.enqueue();
|
||||
}
|
||||
public JsonObject runSync() throws Exception {
|
||||
long timestamp = System.currentTimeMillis() / 1000;
|
||||
Response response = Request.builder()
|
||||
.url(url)
|
||||
.callbackThreadMode(ThreadMode.MAIN)
|
||||
.userAgent("Szkolny.eu/"+BuildConfig.VERSION_NAME+" (Android "+Build.VERSION.RELEASE+"; "+Build.MANUFACTURER+" "+Build.MODEL+")")
|
||||
.addParams(params)
|
||||
.addParameter("username", username)
|
||||
.addParameter("app_version_build_type", BuildConfig.BUILD_TYPE)
|
||||
.addParameter("app_version_code", Integer.toString(BuildConfig.VERSION_CODE))
|
||||
.addParameter("app_version", BuildConfig.VERSION_NAME + " " + BuildConfig.BUILD_TYPE + " (" + BuildConfig.VERSION_CODE + ")")
|
||||
.addParameter("device_id", Settings.Secure.getString(app.getContentResolver(), Settings.Secure.ANDROID_ID))
|
||||
.addParameter("device_model", Build.MANUFACTURER+" "+Build.MODEL)
|
||||
.addParameter("device_os_version", Build.VERSION.RELEASE)
|
||||
.addParameter("fcm_token", app.getConfig().getSync().getTokenApp())
|
||||
.addParameter("signature", "TODO")
|
||||
.addParameter("signature_timestamp", timestamp)
|
||||
.addParameter("package_name", "pl.szczodrzynski.edziennik")
|
||||
.addParameter("source", source)
|
||||
.addParameter("update_frequency", app.getConfig().getSync().getEnabled() ? app.getConfig().getSync().getInterval() : -1)
|
||||
.post()
|
||||
.build()
|
||||
.execute();
|
||||
return new JsonCallbackHandler().backgroundParser(response);
|
||||
}
|
||||
}
|
||||
@ -1,48 +0,0 @@
|
||||
package pl.szczodrzynski.edziennik.ui.dialogs;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.View;
|
||||
|
||||
import com.afollestad.materialdialogs.MaterialDialog;
|
||||
|
||||
import pl.szczodrzynski.edziennik.App;
|
||||
|
||||
public class GenericDialog {
|
||||
private App app;
|
||||
private Context context;
|
||||
|
||||
public GenericDialog(Context context) {
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
private MaterialDialog dialog;
|
||||
private View dialogView;
|
||||
|
||||
public void positiveButton()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void show(App _app)
|
||||
{
|
||||
this.app = _app;
|
||||
dialog = new MaterialDialog.Builder(context)
|
||||
.title("Dialog title")
|
||||
//.customView(R.layout.dialog_register_exam_add, true)
|
||||
.positiveText("Positive")
|
||||
.negativeText("Negative")
|
||||
.autoDismiss(false)
|
||||
.onPositive((dialog, which) -> positiveButton())
|
||||
.onNegative((dialog, which) -> dialog.dismiss())
|
||||
.show();
|
||||
|
||||
dialogView = dialog.getCustomView();
|
||||
assert dialogView != null;
|
||||
|
||||
// USE NavView.TextView.* instead
|
||||
/*TypedValue typedValue = new TypedValue();
|
||||
Resources.Theme theme = context.getTheme();
|
||||
theme.resolveAttribute(android.R.attr.textColorPrimary, typedValue, true);
|
||||
@ColorInt int primaryTextColor = typedValue.data;*/
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user