Skip to content
This repository was archived by the owner on Jun 1, 2024. It is now read-only.

custom synccit url option #3122 #3138

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

custom synccit url option #3122 #3138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a67634d
custom synccit url option
RubenNL Mar 11, 2020
5b4efb8
Forgot to remove a System.out debug statement.
RubenNL Mar 11, 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
10 changes: 9 additions & 1 deletion app/src/main/java/me/ccrama/redditslide/Activities/SettingsSynccit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class SettingsSynccit extends BaseActivityAnim {

EditText name;
EditText auth;
EditText url;

public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -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);
Expand All @@ -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)
Expand All @@ -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);

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/me/ccrama/redditslide/SettingValues.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -197,6 +198,7 @@ public class SettingValues {

public static String synccitName;
public static String synccitAuth;
public static String synccitUrl;

public static Set<String> titleFilters;
public static Set<String> textFilters;
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitReadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,7 +39,6 @@ protected void onVisited(HashSet<String> visitedThreadIds) {
protected String getUsername() {
return SettingValues.synccitName;
}

@Override
protected String getAuth() {
return SettingValues.synccitAuth;
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/me/ccrama/redditslide/Synccit/MySynccitUpdateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/ccrama/redditslide/Synccit/SynccitReadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/java/me/ccrama/redditslide/Synccit/SynccitTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
public abstract class SynccitTask extends HttpPostTask<SynccitResponse> {

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";
Expand All @@ -30,8 +30,8 @@ public abstract class SynccitTask extends HttpPostTask<SynccitResponse> {
/** developer name */
private String devName;

SynccitTask(String devName) {
super(API_URL);
SynccitTask(String devName,String url) {
super(url);
this.devName = devName;
}

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/ccrama/redditslide/Synccit/SynccitUpdateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions app/src/main/res/layout/activity_settings_synccit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,17 @@
android:descendantFocusability="beforeDescendants"
android:paddingTop="16dp">

<EditText
android:id="@+id/url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:hint="@string/settings_synccit_url"
android:textColor="?attr/fontColor"
android:textColorHint="?attr/fontColor"
android:textSize="14sp" />

<EditText
android:id="@+id/name"
android:layout_width="match_parent"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,7 @@
<string name="settings_comment_color">Colorful comment depth indicators</string>
<string name="settings_volume_nav_comments">Navigate comments using volume buttons</string>
<string name="settings_synccit_remove">DISCONNECT SYNCCIT</string>
<string name="settings_synccit_url">url</string>
<string name="settings_synccit_auth">Auth code</string>
<string name="settings_synccit_username">Username</string>
<string name="settings_synccit_delete">Really delete Synccit account?</string>
Expand Down