diff --git a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSynccit.java b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSynccit.java index a0bc45f57b..2c547968d2 100644 --- a/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSynccit.java +++ b/app/src/main/java/me/ccrama/redditslide/Activities/SettingsSynccit.java @@ -27,6 +27,7 @@ public class SettingsSynccit extends BaseActivityAnim { EditText name; EditText auth; + EditText url; public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -37,9 +38,11 @@ public void onCreate(Bundle savedInstanceState) { name = (EditText) findViewById(R.id.name); auth = (EditText) findViewById(R.id.auth); + url = (EditText) findViewById(R.id.url); name.setText(SettingValues.synccitName); auth.setText(SettingValues.synccitAuth); + url.setText(SettingValues.synccitUrl); if (SettingValues.synccitAuth.isEmpty()) { (findViewById(R.id.remove)).setEnabled(false); @@ -56,13 +59,16 @@ public void onClick(View v) { public void onClick(DialogInterface dialog, int which) { SettingValues.synccitName = ""; SettingValues.synccitAuth = ""; + SettingValues.synccitUrl = "https://api.synccit.com/api.php"; SharedPreferences.Editor e = SettingValues.prefs.edit(); e.putString(SettingValues.SYNCCIT_NAME, SettingValues.synccitName); e.putString(SettingValues.SYNCCIT_AUTH, SettingValues.synccitAuth); + e.putString(SettingValues.SYNCCIT_URL, SettingValues.synccitUrl); e.apply(); name.setText(SettingValues.synccitName); auth.setText(SettingValues.synccitAuth); + url.setText(SettingValues.synccitUrl); SynccitRead.visitedIds.removeAll(Collections.singleton("16noez")); } }).setNegativeButton(R.string.btn_no, null) @@ -83,15 +89,17 @@ public void onClick(View v) { new MySynccitUpdateTask().execute("16noez"); SettingValues.synccitName = name.getText().toString(); SettingValues.synccitAuth = auth.getText().toString(); + SettingValues.synccitUrl = url.getText().toString(); try { new MySynccitReadTask().execute("16noez").get(); if (SynccitRead.visitedIds.contains("16noez")) { - //success + //success d.dismiss(); SharedPreferences.Editor e = SettingValues.prefs.edit(); e.putString(SettingValues.SYNCCIT_NAME, SettingValues.synccitName); e.putString(SettingValues.SYNCCIT_AUTH, SettingValues.synccitAuth); + e.putString(SettingValues.SYNCCIT_URL, SettingValues.synccitUrl); e.apply(); (findViewById(R.id.remove)).setEnabled(true); diff --git a/app/src/main/java/me/ccrama/redditslide/SettingValues.java b/app/src/main/java/me/ccrama/redditslide/SettingValues.java index 899ceb6a4d..944df24939 100644 --- a/app/src/main/java/me/ccrama/redditslide/SettingValues.java +++ b/app/src/main/java/me/ccrama/redditslide/SettingValues.java @@ -105,6 +105,7 @@ public class SettingValues { public static final String PREF_SELFTEXT_IMAGE_COMMENT = "selftextImageComment"; public static final String SYNCCIT_AUTH = "SYNCCIT_AUTH"; public static final String SYNCCIT_NAME = "SYNCCIT_NAME"; + public static final String SYNCCIT_URL = "SYNCCIT_URL"; public static final String PREF_BLUR = "blur"; public static final String PREF_ALBUM_SWIPE = "albumswipe"; public static final String PREF_COMMENT_NAV = "commentVolumeNav"; @@ -197,6 +198,7 @@ public class SettingValues { public static String synccitName; public static String synccitAuth; + public static String synccitUrl; public static Set titleFilters; public static Set textFilters; @@ -366,6 +368,7 @@ public static void setAllValues(SharedPreferences settings) { scrollSeen = prefs.getBoolean(PREF_SCROLL_SEEN, false); synccitName = prefs.getString(SYNCCIT_NAME, ""); synccitAuth = prefs.getString(SYNCCIT_AUTH, ""); + synccitUrl = prefs.getString(SYNCCIT_URL, "https://api.synccit.com/api.php"); notifSound = prefs.getBoolean(PREF_SOUND_NOTIFS, false); cookies = prefs.getBoolean(PREF_COOKIES, true); linkHandlingMode = prefs.getInt(PREF_LINK_HANDLING_MODE, diff --git a/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitReadTask.java b/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitReadTask.java index b0498ebcbb..71f68ebc89 100644 --- a/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitReadTask.java +++ b/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitReadTask.java @@ -16,12 +16,11 @@ public class MySynccitReadTask extends SynccitReadTask { private SubmissionDisplay displayer; public MySynccitReadTask(SubmissionDisplay displayer) { - super(MY_DEV_NAME); + super(MY_DEV_NAME,SettingValues.synccitUrl); this.displayer = displayer; } - public MySynccitReadTask() { - super(MY_DEV_NAME); + super(MY_DEV_NAME,SettingValues.synccitUrl); } @Override @@ -40,7 +39,6 @@ protected void onVisited(HashSet visitedThreadIds) { protected String getUsername() { return SettingValues.synccitName; } - @Override protected String getAuth() { return SettingValues.synccitAuth; diff --git a/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitUpdateTask.java b/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitUpdateTask.java index f9e7793238..3963e668e4 100644 --- a/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitUpdateTask.java +++ b/app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitUpdateTask.java @@ -10,14 +10,13 @@ public class MySynccitUpdateTask extends SynccitUpdateTask { private static final String MY_DEV_NAME = "slide_for_reddit"; public MySynccitUpdateTask() { - super(MY_DEV_NAME); + super(MY_DEV_NAME,SettingValues.synccitUrl); } @Override protected String getUsername() { return SettingValues.synccitName; } - @Override protected String getAuth() { return SettingValues.synccitAuth; diff --git a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitReadTask.java b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitReadTask.java index 499276e2d5..d40871d9c9 100644 --- a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitReadTask.java +++ b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitReadTask.java @@ -15,8 +15,8 @@ abstract class SynccitReadTask extends SynccitTask { private static final String READ_MODE = "read"; - SynccitReadTask(String devName) { - super(devName); + SynccitReadTask(String devName,String url) { + super(devName,url); } @Override diff --git a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitTask.java b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitTask.java index 42ff0d0f7d..cbe369efdb 100644 --- a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitTask.java +++ b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitTask.java @@ -12,9 +12,9 @@ public abstract class SynccitTask extends HttpPostTask { private static final String TAG = SynccitTask.class.getSimpleName(); - + private static final String API_URL = "https://api.synccit.com/api.php"; - + private static final String PARAM_TYPE = "type"; private static final String PARAM_DATA = "data"; private static final String TYPE_JSON = "json"; @@ -30,8 +30,8 @@ public abstract class SynccitTask extends HttpPostTask { /** developer name */ private String devName; - SynccitTask(String devName) { - super(API_URL); + SynccitTask(String devName,String url) { + super(url); this.devName = devName; } @@ -49,7 +49,6 @@ protected SynccitResponse doInBackground(String... linkIds) { Log.e(TAG, "buildJson", e); return null; } - return super.doInBackground( PARAM_TYPE, TYPE_JSON, PARAM_DATA, data diff --git a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitUpdateTask.java b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitUpdateTask.java index 4fc3e48fe1..0a5f0e4a39 100644 --- a/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitUpdateTask.java +++ b/app/src/main/java/me/ccrama/redditslide/Synccit/SynccitUpdateTask.java @@ -15,8 +15,8 @@ abstract class SynccitUpdateTask extends SynccitTask { private static final String UPDATE_MODE = "update"; - SynccitUpdateTask(String devName) { - super(devName); + SynccitUpdateTask(String devName,String url) { + super(devName,url); } @Override diff --git a/app/src/main/res/layout/activity_settings_synccit.xml b/app/src/main/res/layout/activity_settings_synccit.xml index ba09b151d1..f9d626cf88 100644 --- a/app/src/main/res/layout/activity_settings_synccit.xml +++ b/app/src/main/res/layout/activity_settings_synccit.xml @@ -33,6 +33,17 @@ android:descendantFocusability="beforeDescendants" android:paddingTop="16dp"> + + Colorful comment depth indicators Navigate comments using volume buttons DISCONNECT SYNCCIT + url Auth code Username Really delete Synccit account?