summaryrefslogtreecommitdiffstats
path: root/app/src/main/java/de/thedevstack/android/nextcloud
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/de/thedevstack/android/nextcloud')
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/Constants.java9
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmark.java42
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmarkService.java25
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/AppCompatPreferenceActivity.java109
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudBookmarkShareActivity.java51
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudPreferencesActivity.java180
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudAddBookmarkAsyncTask.java40
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudBookmarkRestAsyncTask.java30
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudCheckCredentialsTask.java76
-rw-r--r--app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/rest/NextcloudBookmarkRestClient.java100
10 files changed, 662 insertions, 0 deletions
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/Constants.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/Constants.java
new file mode 100644
index 0000000..458bbe1
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/Constants.java
@@ -0,0 +1,9 @@
+package de.thedevstack.android.nextcloud.bookmark.share;
+
+/**
+ */
+public interface Constants {
+ String SERVER_URL_PREFERENCE_KEY = "nextcloud_server_url";
+ String USERNAME_PREFERENCE_KEY = "nextcloud_username";
+ String PASSWORD_PREFERENCE_KEY = "nextcloud_password";
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmark.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmark.java
new file mode 100644
index 0000000..06bca09
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmark.java
@@ -0,0 +1,42 @@
+package de.thedevstack.android.nextcloud.bookmark.share;
+
+import android.text.TextUtils;
+
+/**
+ */
+public class NextcloudBookmark {
+ private String bookmarkUrl;
+ private String bookmarkTitle;
+
+ public NextcloudBookmark(String bookmarkUrl) {
+ this.bookmarkUrl = bookmarkUrl;
+ }
+
+ public NextcloudBookmark(String bookmarkUrl, String bookmarkTitle) {
+ this.bookmarkUrl = bookmarkUrl;
+ this.bookmarkTitle = bookmarkTitle;
+ }
+
+ public String getBookmarkUrl() {
+ return bookmarkUrl;
+ }
+
+ public void setBookmarkUrl(String bookmarkUrl) {
+ this.bookmarkUrl = bookmarkUrl;
+ }
+
+ public String getBookmarkTitle() {
+ return bookmarkTitle;
+ }
+
+ public void setBookmarkTitle(String bookmarkTitle) {
+ this.bookmarkTitle = bookmarkTitle;
+ }
+
+ public static NextcloudBookmark create(String url, String title) {
+ if (!TextUtils.isEmpty(url)) {
+ return new NextcloudBookmark(url, title);
+ }
+ return null;
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmarkService.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmarkService.java
new file mode 100644
index 0000000..0ab0282
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmarkService.java
@@ -0,0 +1,25 @@
+package de.thedevstack.android.nextcloud.bookmark.share;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import de.thedevstack.android.nextcloud.bookmark.share.async.NextcloudAddBookmarkAsyncTask;
+
+/**
+ */
+public class NextcloudBookmarkService {
+ public static void addBookmark(Activity context, Intent intent) {
+ String bookmarkUrl = intent.getStringExtra(Intent.EXTRA_TEXT);
+ String bookmarkTitle = intent.getStringExtra(Intent.EXTRA_TITLE);
+
+ addBookmark(context, bookmarkUrl, bookmarkTitle);
+ }
+
+ public static void addBookmark(Activity context, String bookmarkUrl, String bookmarkTitle) {
+ new NextcloudAddBookmarkAsyncTask(context).execute(bookmarkUrl, bookmarkTitle);
+ }
+
+ public static void addBookmark(Activity context, NextcloudBookmark bookmark) {
+ new NextcloudAddBookmarkAsyncTask(context).execute(bookmark.getBookmarkUrl(), bookmark.getBookmarkTitle());
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/AppCompatPreferenceActivity.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/AppCompatPreferenceActivity.java
new file mode 100644
index 0000000..810a981
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/AppCompatPreferenceActivity.java
@@ -0,0 +1,109 @@
+package de.thedevstack.android.nextcloud.bookmark.share.activities;
+
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.support.annotation.LayoutRes;
+import android.support.annotation.Nullable;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
+ * to be used with AppCompat.
+ */
+public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
+
+ private AppCompatDelegate mDelegate;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ getDelegate().installViewFactory();
+ getDelegate().onCreate(savedInstanceState);
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ protected void onPostCreate(Bundle savedInstanceState) {
+ super.onPostCreate(savedInstanceState);
+ getDelegate().onPostCreate(savedInstanceState);
+ }
+
+ public ActionBar getSupportActionBar() {
+ return getDelegate().getSupportActionBar();
+ }
+
+ public void setSupportActionBar(@Nullable Toolbar toolbar) {
+ getDelegate().setSupportActionBar(toolbar);
+ }
+
+ @Override
+ public MenuInflater getMenuInflater() {
+ return getDelegate().getMenuInflater();
+ }
+
+ @Override
+ public void setContentView(@LayoutRes int layoutResID) {
+ getDelegate().setContentView(layoutResID);
+ }
+
+ @Override
+ public void setContentView(View view) {
+ getDelegate().setContentView(view);
+ }
+
+ @Override
+ public void setContentView(View view, ViewGroup.LayoutParams params) {
+ getDelegate().setContentView(view, params);
+ }
+
+ @Override
+ public void addContentView(View view, ViewGroup.LayoutParams params) {
+ getDelegate().addContentView(view, params);
+ }
+
+ @Override
+ protected void onPostResume() {
+ super.onPostResume();
+ getDelegate().onPostResume();
+ }
+
+ @Override
+ protected void onTitleChanged(CharSequence title, int color) {
+ super.onTitleChanged(title, color);
+ getDelegate().setTitle(title);
+ }
+
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ getDelegate().onConfigurationChanged(newConfig);
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ getDelegate().onStop();
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ getDelegate().onDestroy();
+ }
+
+ public void invalidateOptionsMenu() {
+ getDelegate().invalidateOptionsMenu();
+ }
+
+ private AppCompatDelegate getDelegate() {
+ if (mDelegate == null) {
+ mDelegate = AppCompatDelegate.create(this, null);
+ }
+ return mDelegate;
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudBookmarkShareActivity.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudBookmarkShareActivity.java
new file mode 100644
index 0000000..1bba5b7
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudBookmarkShareActivity.java
@@ -0,0 +1,51 @@
+package de.thedevstack.android.nextcloud.bookmark.share.activities;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.text.TextUtils;
+
+import de.thedevstack.android.nextcloud.bookmark.share.Constants;
+import de.thedevstack.android.nextcloud.bookmark.share.NextcloudBookmarkService;
+
+/**
+ */
+public class NextcloudBookmarkShareActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Intent intent = getIntent();
+ String action = intent.getAction();
+ String type = intent.getType();
+
+ if (Intent.ACTION_SEND.equals(action) && type != null) { // Opened via share menu
+ if ("text/plain".equals(type)) {
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(NextcloudBookmarkShareActivity.this.getApplicationContext());
+
+ if (!existsAndIsNotEmpty(prefs, Constants.SERVER_URL_PREFERENCE_KEY)
+ || !existsAndIsNotEmpty(prefs, Constants.USERNAME_PREFERENCE_KEY)
+ || !existsAndIsNotEmpty(prefs, Constants.PASSWORD_PREFERENCE_KEY)) {
+ Intent settingsActivityIntent = new Intent(this, NextcloudPreferencesActivity.class);
+
+ String bookmarkUrl = intent.getStringExtra(Intent.EXTRA_TEXT);
+ String bookmarkTitle = intent.getStringExtra(Intent.EXTRA_TITLE);
+
+ settingsActivityIntent.putExtra(Intent.EXTRA_TEXT, bookmarkUrl);
+ settingsActivityIntent.putExtra(Intent.EXTRA_TITLE, bookmarkTitle);
+
+ startActivity(settingsActivityIntent);
+ } else {
+ NextcloudBookmarkService.addBookmark(this, intent);
+ }
+ }
+ }
+ this.finish();
+ }
+
+ private boolean existsAndIsNotEmpty(SharedPreferences prefs, String prefKey) {
+ return !TextUtils.isEmpty(prefs.getString(prefKey, ""));
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudPreferencesActivity.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudPreferencesActivity.java
new file mode 100644
index 0000000..79c7e6f
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudPreferencesActivity.java
@@ -0,0 +1,180 @@
+package de.thedevstack.android.nextcloud.bookmark.share.activities;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.EditorInfo;
+import android.webkit.URLUtil;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import de.thedevstack.android.nextcloud.bookmark.share.Constants;
+import de.thedevstack.android.nextcloud.bookmark.share.NextcloudBookmark;
+import de.thedevstack.android.nextcloud.bookmark.share.R;
+import de.thedevstack.android.nextcloud.bookmark.share.async.NextcloudCheckCredentialsTask;
+
+/**
+ * A login screen that offers login via username/password.
+ */
+public class NextcloudPreferencesActivity extends AppCompatActivity {
+ /**
+ * Keep track of the login task to ensure we can cancel it if requested.
+ */
+ private NextcloudCheckCredentialsTask checkCredentialsTask = null;
+
+ // UI references.
+ private EditText serverUrlView;
+ private EditText usernameView;
+ private EditText passwordView;
+ private View mProgressView;
+ private View mLoginFormView;
+ private NextcloudBookmark bookmark;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_nextcloud_preferences);
+
+ Intent intent = getIntent();
+
+ this.bookmark = NextcloudBookmark.create(intent.getStringExtra(Intent.EXTRA_TEXT), intent.getStringExtra(Intent.EXTRA_TITLE));
+
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+
+ // Set up the login form.
+ serverUrlView = findViewById(R.id.serverUrl);
+ serverUrlView.setText(prefs.getString(Constants.SERVER_URL_PREFERENCE_KEY, getString(R.string.default_server_url)));
+ usernameView = findViewById(R.id.username);
+ usernameView.setText(prefs.getString(Constants.USERNAME_PREFERENCE_KEY, getString(R.string.default_blank)));
+
+ passwordView = findViewById(R.id.password);
+ passwordView.setText(prefs.getString(Constants.PASSWORD_PREFERENCE_KEY, getString(R.string.default_blank)));
+ passwordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+ @Override
+ public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) {
+ if (id == EditorInfo.IME_ACTION_DONE || id == EditorInfo.IME_NULL) {
+ checkCredentials();
+ return true;
+ }
+ return false;
+ }
+ });
+
+ findViewById(R.id.sign_in_button).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ checkCredentials();
+ }
+ });
+
+ mLoginFormView = findViewById(R.id.login_form);
+ mProgressView = findViewById(R.id.login_progress);
+ }
+
+ /**
+ * Attempts to sign in or register the account specified by the login form.
+ * If there are form errors (invalid email, missing fields, etc.), the
+ * errors are presented and no actual login attempt is made.
+ */
+ private void checkCredentials() {
+ if (checkCredentialsTask != null) {
+ return;
+ }
+
+ // Reset errors.
+ serverUrlView.setError(null);
+ usernameView.setError(null);
+ passwordView.setError(null);
+
+ // Store values at the time of the login attempt.
+ String nextcloudServerUrl = serverUrlView.getText().toString();
+ String username = usernameView.getText().toString();
+ String password = passwordView.getText().toString();
+
+ boolean cancel = false;
+ View focusView = null;
+
+ if (TextUtils.isEmpty(nextcloudServerUrl) || !URLUtil.isNetworkUrl(nextcloudServerUrl)) {
+ serverUrlView.setError(getString(R.string.error_server_url_invalid));
+ focusView = serverUrlView;
+ cancel = true;
+ }
+
+ // Check for a valid email address.
+ if (TextUtils.isEmpty(username)) {
+ usernameView.setError(getString(R.string.error_field_required));
+ focusView = usernameView;
+ cancel = true;
+ }
+
+ if (cancel) {
+ // There was an error; don't attempt login and focus the first
+ // form field with an error.
+ focusView.requestFocus();
+ } else {
+ // Show a progress spinner, and kick off a background task to
+ // perform the user login attempt.
+ showProgress(true);
+ checkCredentialsTask = new NextcloudCheckCredentialsTask(this, this.bookmark, nextcloudServerUrl, username, password);
+ checkCredentialsTask.execute((Intent) null);
+ }
+ }
+
+ /**
+ * Shows the progress UI and hides the login form.
+ */
+ @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR2)
+ public void showProgress(final boolean show) {
+ // On Honeycomb MR2 we have the ViewPropertyAnimator APIs, which allow
+ // for very easy animations. If available, use these APIs to fade-in
+ // the progress spinner.
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
+ int shortAnimTime = getResources().getInteger(android.R.integer.config_shortAnimTime);
+
+ mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
+ mLoginFormView.animate().setDuration(shortAnimTime).alpha(
+ show ? 0 : 1).setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
+ }
+ });
+
+ mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
+ mProgressView.animate().setDuration(shortAnimTime).alpha(
+ show ? 1 : 0).setListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
+ });
+ } else {
+ // The ViewPropertyAnimator APIs are not available, so simply show
+ // and hide the relevant UI components.
+ mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
+ mLoginFormView.setVisibility(show ? View.GONE : View.VISIBLE);
+ }
+ }
+
+ public void stopProgress() {
+ this.checkCredentialsTask = null;
+ showProgress(false);
+ }
+
+ public void showIncorrectPassword() {
+ passwordView.setError(getString(R.string.error_incorrect_password));
+ passwordView.requestFocus();
+ }
+}
+
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudAddBookmarkAsyncTask.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudAddBookmarkAsyncTask.java
new file mode 100644
index 0000000..14ddcfd
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudAddBookmarkAsyncTask.java
@@ -0,0 +1,40 @@
+package de.thedevstack.android.nextcloud.bookmark.share.async;
+
+import android.app.Activity;
+import android.util.Log;
+import android.widget.Toast;
+
+import de.thedevstack.android.nextcloud.bookmark.share.R;
+
+/**
+ */
+public class NextcloudAddBookmarkAsyncTask extends NextcloudBookmarkRestAsyncTask<String, Integer> {
+
+ public NextcloudAddBookmarkAsyncTask(Activity context) {
+ super(context.getApplicationContext());
+ }
+
+ @Override
+ protected void onPreExecute() {
+ super.onPreExecute();
+ }
+
+ @Override
+ protected Integer doInBackground(String... params) {
+ String bookmarkUrl = params[0];
+ //String bookmarkTitle = params[1];
+
+ return this.client.addBookmark(bookmarkUrl);
+ }
+
+ @Override
+ protected void onPostExecute(Integer resultCode) {
+ if (200 == resultCode) {
+ Log.i("NCAddBookmarkAsync", "Bookmark successfully set");
+ Toast.makeText(context, R.string.toast_bookmark_add_success, Toast.LENGTH_LONG).show();
+ } else {
+ Log.e("NCAddBookmarkAsync", "Failed to set Bookmark");
+ Toast.makeText(context, R.string.toast_bookmark_add_failed, Toast.LENGTH_LONG).show();
+ }
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudBookmarkRestAsyncTask.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudBookmarkRestAsyncTask.java
new file mode 100644
index 0000000..c1100e0
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudBookmarkRestAsyncTask.java
@@ -0,0 +1,30 @@
+package de.thedevstack.android.nextcloud.bookmark.share.async;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+
+import de.thedevstack.android.nextcloud.bookmark.share.Constants;
+import de.thedevstack.android.nextcloud.bookmark.share.rest.NextcloudBookmarkRestClient;
+
+/**
+ */
+public abstract class NextcloudBookmarkRestAsyncTask<Params, Result> extends AsyncTask<Params, Void, Result> {
+ protected NextcloudBookmarkRestClient client;
+ protected Context context;
+
+ public NextcloudBookmarkRestAsyncTask(Context context){
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ String serverUrl = prefs.getString(Constants.SERVER_URL_PREFERENCE_KEY, null);
+ String username = prefs.getString(Constants.USERNAME_PREFERENCE_KEY, null);
+ String password = prefs.getString(Constants.PASSWORD_PREFERENCE_KEY, null);
+
+ this.client = new NextcloudBookmarkRestClient(serverUrl, username, password);
+ this.context = context;
+ }
+
+ public NextcloudBookmarkRestAsyncTask(String serverUrl, String username, String password) {
+ this.client = new NextcloudBookmarkRestClient(serverUrl, username, password);
+ }
+}
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudCheckCredentialsTask.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudCheckCredentialsTask.java
new file mode 100644
index 0000000..b701197
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudCheckCredentialsTask.java
@@ -0,0 +1,76 @@
+package de.thedevstack.android.nextcloud.bookmark.share.async;
+
+import android.content.Intent;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import de.thedevstack.android.nextcloud.bookmark.share.Constants;
+import de.thedevstack.android.nextcloud.bookmark.share.NextcloudBookmark;
+import de.thedevstack.android.nextcloud.bookmark.share.NextcloudBookmarkService;
+import de.thedevstack.android.nextcloud.bookmark.share.R;
+import de.thedevstack.android.nextcloud.bookmark.share.activities.NextcloudPreferencesActivity;
+
+/**
+ * Represents an asynchronous login/registration task used to authenticate
+ * the user.
+ */
+public class NextcloudCheckCredentialsTask extends NextcloudBookmarkRestAsyncTask<Intent, Boolean> {
+ private NextcloudPreferencesActivity preferencesActivity;
+ private NextcloudSettings ncSettings;
+ private NextcloudBookmark bookmark;
+
+ public NextcloudCheckCredentialsTask(NextcloudPreferencesActivity preferencesActivity, NextcloudBookmark bookmark, String serverUrl, String username, String password) {
+ this(preferencesActivity, serverUrl, username, password);
+ this.bookmark = bookmark;
+ }
+
+ public NextcloudCheckCredentialsTask(NextcloudPreferencesActivity preferencesActivity, String serverUrl, String username, String password) {
+ super(serverUrl, username, password);
+ this.preferencesActivity = preferencesActivity;
+ this.ncSettings = new NextcloudSettings();
+ this.ncSettings.serverUrl = serverUrl;
+ this.ncSettings.username = username;
+ this.ncSettings.password = password;
+ }
+
+ @Override
+ protected Boolean doInBackground(Intent... params) {
+ return this.client.checkCredentials();
+ }
+
+ @Override
+ protected void onPostExecute(final Boolean success) {
+ this.preferencesActivity.stopProgress();
+
+ Log.d("NCCheckCredentials", "result is " + success);
+ if (success) {
+ Log.d("NCCheckCredentials", "applying preferences");
+ PreferenceManager.getDefaultSharedPreferences(this.preferencesActivity.getApplicationContext())
+ .edit()
+ .putString(Constants.SERVER_URL_PREFERENCE_KEY, this.ncSettings.serverUrl)
+ .putString(Constants.USERNAME_PREFERENCE_KEY, this.ncSettings.username)
+ .putString(Constants.PASSWORD_PREFERENCE_KEY, this.ncSettings.password)
+ .commit();
+ if (null != this.bookmark) {
+ NextcloudBookmarkService.addBookmark(this.preferencesActivity, this.bookmark);
+ this.preferencesActivity.finish();
+ } else {
+ Toast.makeText(this.preferencesActivity, R.string.toast_settings_update_success, Toast.LENGTH_LONG).show();
+ }
+ } else {
+ this.preferencesActivity.showIncorrectPassword();
+ }
+ }
+
+ @Override
+ protected void onCancelled() {
+ this.preferencesActivity.stopProgress();
+ }
+
+ private class NextcloudSettings {
+ String serverUrl;
+ String username;
+ String password;
+ }
+} \ No newline at end of file
diff --git a/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/rest/NextcloudBookmarkRestClient.java b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/rest/NextcloudBookmarkRestClient.java
new file mode 100644
index 0000000..e92d9a0
--- /dev/null
+++ b/app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/rest/NextcloudBookmarkRestClient.java
@@ -0,0 +1,100 @@
+package de.thedevstack.android.nextcloud.bookmark.share.rest;
+
+import android.util.Base64;
+import android.util.Log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import javax.net.ssl.HttpsURLConnection;
+
+/**
+ */
+public class NextcloudBookmarkRestClient {
+ private static final String LOGTAG = "NCBookmarkRestClient";
+ private static final String BOOKMARK_APP_REST_API = "/apps/bookmarks/public/rest/v2/bookmark";
+ private final String username;
+ private final String password;
+ private final String serverUrl;
+ private final String restApiBaseUrl;
+ private HttpsURLConnection urlConnection;
+
+ public NextcloudBookmarkRestClient(String serverUrl, String username, String password) {
+ this.serverUrl = serverUrl;
+ this.username = username;
+ this.password = password;
+ this.restApiBaseUrl = serverUrl + BOOKMARK_APP_REST_API;
+ }
+
+ private void openConnection(String url) throws IOException {
+ this.urlConnection = (HttpsURLConnection) new URL(url).openConnection();
+ String encoded = Base64.encodeToString((this.username+":"+this.password).getBytes(StandardCharsets.UTF_8), 0);
+ this.urlConnection.setRequestProperty("Authorization", "Basic "+encoded);
+ }
+
+ public boolean checkCredentials() {
+ Log.d(LOGTAG, "checking credentials");
+ boolean validCredentials = false;
+ try {
+ this.openConnection(this.restApiBaseUrl);
+ this.urlConnection.setRequestMethod("HEAD");
+ this.urlConnection.connect();
+ validCredentials = 401 != this.urlConnection.getResponseCode();
+ Log.d(LOGTAG, "credentials are " + validCredentials);
+ } catch (IOException e) {
+ System.out.println(e.getMessage());
+ } finally {
+ if (null != this.urlConnection) {
+ this.urlConnection.disconnect();
+ }
+ return validCredentials;
+ }
+ }
+
+ public int addBookmark(String bookmarkUrl) {
+ Log.d(LOGTAG, "trying to add bookmark for '" + bookmarkUrl + "'");
+ int responseCode = -1;
+ StringBuffer sb = new StringBuffer();
+ InputStream is = null;
+
+ try {
+ this.openConnection(this.restApiBaseUrl + "?url=" + bookmarkUrl);
+ this.urlConnection.setRequestMethod("POST");
+ this.urlConnection.connect();
+
+ is = new BufferedInputStream(urlConnection.getInputStream());
+ BufferedReader br = new BufferedReader(new InputStreamReader(is));
+ String inputLine = "";
+ while ((inputLine = br.readLine()) != null) {
+ sb.append(inputLine);
+ }
+ Log.d(LOGTAG, sb.toString());
+
+ responseCode = this.urlConnection.getResponseCode();
+ } catch (Exception e) {
+ Log.e(LOGTAG, "Error while trying to add bookmark: " + e.getMessage());
+ }
+ finally {
+ Log.i(LOGTAG, "disconnecting...");
+ if (null != this.urlConnection) {
+ this.urlConnection.disconnect();
+ }
+
+ if (is != null) {
+ try {
+ is.close();
+ }
+ catch (IOException e) {
+ Log.d(LOGTAG, "Error closing InputStream");
+ }
+ }
+
+ return responseCode;
+ }
+ }
+}