github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI: news page saves cookies for analytics;

Browse source
This commit is contained in:
Oleg Agafonov 2019-03-29 09:26:26 +04:00
parent 9dfa23e5c4
commit ad9ba216f2
2 changed files with 89 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -274,6 +274,7 @@ public class PreferencesDialog extends javax.swing.JDialog {
// news
public static final String KEY_NEWS_PAGE_LAST_VERSION = "newsPageLastVersion";
public static final String KEY_NEWS_PAGE_COOKIES = "newsPageCookies";
// controls
public static final String KEY_CONTROL_TOGGLE_MACRO = "controlToggleMacro";

88
Mage.Client/src/main/java/mage/client/dialog/WhatsNewDialog.java
View file

@ -1,5 +1,8 @@
package mage.client.dialog;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
@ -18,7 +21,10 @@ import java.awt.*;
import java.awt.event.KeyEvent;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.net.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
/**
@ -29,6 +35,7 @@ public class WhatsNewDialog extends MageDialog {
private static final Logger logger = Logger.getLogger(WhatsNewDialog.class);
private static final MageVersion clientVersion = new MageVersion(WhatsNewDialog.class);
// cookies tester: http://www.html-kit.com/tools/cookietester/
private static final String WHATS_NEW_PAGE = "https://jaydi85.github.io/xmage-web-news/news.html";
private static final String WHATS_NEW_VERSION_PAGE = "https://jaydi85.github.io/xmage-web-news/news_version.html"; // increment version=123 to auto-shown for all users
private static final int WHATS_NEW_LOAD_TIMEOUT_SECS = 20; // timeout for page loading
@ -117,6 +124,7 @@ public class WhatsNewDialog extends MageDialog {
public WhatsNewDialog() {
initComponents();
this.setDefaultCloseOperation(HIDE_ON_CLOSE);
fxPanel = new JFXPanel();
panelData.add(fxPanel);
@ -163,6 +171,83 @@ public class WhatsNewDialog extends MageDialog {
this.setVisible(true);
}
/**
* Store cookies in preferences
*/
private class PersistentCookieStore implements CookieStore, Runnable {
private CookieStore store;
public PersistentCookieStore() {
store = new CookieManager().getCookieStore();
// restore data
loadFromPrefs();
// save data on app close
Runtime.getRuntime().addShutdownHook(new Thread(this));
}
private void loadFromPrefs() {
String sourceValue = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, "");
Gson gson = new GsonBuilder().create();
List<HttpCookie> httpCookies = new ArrayList<>();
Type type = new TypeToken<List<HttpCookie>>() {
}.getType();
try {
httpCookies = gson.fromJson(sourceValue, type);
for (HttpCookie cookie : httpCookies) {
store.add(URI.create(cookie.getDomain()), cookie);
}
} catch (Exception e) {
logger.error("Wrong news page cookies", e);
}
}
private void saveToPrefs() {
List<HttpCookie> httpCookies = store.getCookies();
Gson gson = new GsonBuilder().create();
String destValue = gson.toJson(httpCookies);
PreferencesDialog.saveValue(PreferencesDialog.KEY_NEWS_PAGE_COOKIES, destValue);
}
@Override
public void run() {
saveToPrefs();
}
@Override
public void add(URI uri, HttpCookie cookie) {
store.add(uri, cookie);
}
@Override
public List<HttpCookie> get(URI uri) {
return store.get(uri);
}
@Override
public List<HttpCookie> getCookies() {
return store.getCookies();
}
@Override
public List<URI> getURIs() {
return store.getURIs();
}
@Override
public boolean remove(URI uri, HttpCookie cookie) {
return store.remove(uri, cookie);
}
@Override
public boolean removeAll() {
return store.removeAll();
}
}
private void createWebView() {
// init web engine and events
@ -177,6 +262,9 @@ public class WhatsNewDialog extends MageDialog {
engine.setUserAgent(engine.getUserAgent() + " XMage/" + clientVersion.toString(false));
view.contextMenuEnabledProperty().setValue(false);
CookieManager cookieManager = new CookieManager(new PersistentCookieStore(), CookiePolicy.ACCEPT_ALL);
CookieHandler.setDefault(cookieManager);
// on error
engine.getLoadWorker().exceptionProperty().addListener(new ChangeListener<Throwable>() {
public void changed(ObservableValue<? extends Throwable> o, Throwable old, final Throwable value) {