Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bc30c1d
Revert "Fork Update"
krmanik Jun 25, 2020
6a3339c
Update fork
krmanik Jun 26, 2020
c8181c3
Merge branch 'master' of https://github.com/ankidroid/Anki-Android
krmanik Jun 28, 2020
0d37a81
Merge branch 'master' of https://github.com/ankidroid/Anki-Android
krmanik Jun 30, 2020
6184bef
api versioning
krmanik Jun 21, 2020
7254e0b
Updated AbstractFlashcardViewer.java, 02-strings.xml
krmanik Jun 24, 2020
939e6c1
Added Vesrion Compare using Comparable
krmanik Jun 27, 2020
638512e
Added Java SemVer for JS API
krmanik Jun 28, 2020
ef8cdcb
Updated AbstractFlashcardViewer.java, 02-strings.xml
krmanik Jul 1, 2020
474b616
Updated 02-strings.xml
krmanik Jul 4, 2020
d8b7c41
Updated 02-strings.xml
krmanik Jul 4, 2020
6544a1e
Updated 02-strings.xml
krmanik Jul 4, 2020
e3571aa
Merge branch 'master' into js-api-version
krmanik Jul 4, 2020
75dc239
Updated 02-strings.xml
krmanik Jul 5, 2020
e68e5a5
Updated AbstractFlashcardViewer.java
krmanik Jul 5, 2020
fe482d7
Updated AbstractFlashcardViewer.java
krmanik Jul 5, 2020
80079d9
Handle when API not initialised
krmanik Jul 5, 2020
e2f068a
Update JS API
krmanik Jul 25, 2020
401cddc
Update js api
krmanik Jul 26, 2020
1399b90
Merge branch 'master' of https://github.com/ankidroid/Anki-Android in…
krmanik Aug 4, 2020
7204912
Update 02-strings.xml
krmanik Aug 4, 2020
793063e
Update AbstractFlashcardViewer.java
krmanik Aug 4, 2020
c055f95
init js api
krmanik Aug 5, 2020
6a2b548
Updated
krmanik Aug 6, 2020
c0ff6c3
Updated
krmanik Aug 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ public abstract class AbstractFlashcardViewer extends NavigationDrawerActivity i

// ETA
private int eta;
// JavaScript Versioning
protected String mCardSuppliedApiVersion = "";
protected String mCardSuppliedDeveloperContact = "";

// js api developer contact
private String mCardSuppliedDeveloperContact = "";

private static final String sCurrentJsApiVersion = "0.0.1";
private static final String sMinimumJsApiVersion = "0.0.1";
Expand Down Expand Up @@ -3649,8 +3649,13 @@ public class JavaScriptFunction {
// list of api that can be accessed
private final String[] sApiList = {"toggleFlag", "markCard"};

// api disabled when valid api version not provided
private void disableJsApi() {
// JavaScript Versioning
private String mCardSuppliedApiVersion = "";

// initialize api
private void initJsApi() {
mCardSuppliedDeveloperContact = "";
mCardSuppliedApiVersion = "";
for (int i = 0; i < sApiList.length; i++) {
mJsApiListMap.put(sApiList[i], false);
}
Expand All @@ -3665,6 +3670,9 @@ private void enableJsApi() {

@JavascriptInterface
public String init(String jsonData) {
// initialize api
initJsApi();
Comment thread
david-allison marked this conversation as resolved.
Outdated

JSONObject data;
String apiStatusJson = "";

Expand All @@ -3676,9 +3684,8 @@ public String init(String jsonData) {

if (requireApiVersion(mCardSuppliedApiVersion, mCardSuppliedDeveloperContact)) {
enableJsApi();
} else {
disableJsApi();
}

apiStatusJson = sGson.toJson(mJsApiListMap);
}

Expand Down