diff options
author | steckbrief <steckbrief@chefmail.de> | 2018-11-26 23:56:45 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2018-11-26 23:56:45 +0100 |
commit | 9a16c9609610bd9dd7969cdc9048724ccfbdffdc (patch) | |
tree | 4020c7d5996fbad85126e45c0c01bb1e034bcc89 |
first version of NextcloudShareBookmark
57 files changed, 1515 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09b993d --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..b30d562 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,29 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 27 + defaultConfig { + applicationId "de.thedevstack.android.nextcloud.bookmark.share" + minSdkVersion 19 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:design:27.1.1' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleInstrumentedTest.java b/app/src/androidTest/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleInstrumentedTest.java new file mode 100644 index 0000000..81828af --- /dev/null +++ b/app/src/androidTest/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package de.thedevstack.android.nextcloud.bookmark.share; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("de.thedevstack.android.nextcloud.bookmark.share", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1489cf9 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="de.thedevstack.android.nextcloud.bookmark.share"> + + <uses-permission android:name="android.permission.INTERNET" /> + + <application + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme"> + <activity + android:name=".activities.NextcloudBookmarkShareActivity" + android:label="@string/sharing_label"> + <intent-filter> + <action android:name="android.intent.action.SEND" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="text/plain" /> + </intent-filter> + </activity> + <activity + android:name=".activities.NextcloudPreferencesActivity" + android:label="@string/title_activity_nextcloud_preferences"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + </application> + +</manifest>
\ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png Binary files differnew file mode 100644 index 0000000..fac28b1 --- /dev/null +++ b/app/src/main/ic_launcher-web.png 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; + } + } +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..c7bd21d --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillType="evenOdd" + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" + android:strokeColor="#00000000" + android:strokeWidth="1"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="78.5885" + android:endY="90.9159" + android:startX="48.7653" + android:startY="61.0927" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0" /> + <item + android:color="#00000000" + android:offset="1.0" /> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" + android:strokeColor="#00000000" + android:strokeWidth="1" /> +</vector> diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml new file mode 100644 index 0000000..34b8202 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_black_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,15h-2v-6h2v6zm0,-8h-2V7h2v2z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportHeight="108" + android:viewportWidth="108"> + <path + android:fillColor="#26A69A" + android:pathData="M0,0h108v108h-108z" /> + <path + android:fillColor="#00000000" + android:pathData="M9,0L9,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,0L19,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M29,0L29,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M39,0L39,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M49,0L49,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M59,0L59,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M69,0L69,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M79,0L79,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M89,0L89,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M99,0L99,108" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,9L108,9" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,19L108,19" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,29L108,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,39L108,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,49L108,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,59L108,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,69L108,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,79L108,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,89L108,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M0,99L108,99" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,29L89,29" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,39L89,39" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,49L89,49" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,59L89,59" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,69L89,69" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M19,79L89,79" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M29,19L29,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M39,19L39,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M49,19L49,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M59,19L59,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M69,19L69,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> + <path + android:fillColor="#00000000" + android:pathData="M79,19L79,89" + android:strokeColor="#33FFFFFF" + android:strokeWidth="0.8" /> +</vector> diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 0000000..e3400cf --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml new file mode 100644 index 0000000..5a283aa --- /dev/null +++ b/app/src/main/res/drawable/ic_sync_black_24dp.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01,-.25 1.97,-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0,-4.42,-3.58,-8,-8,-8zm0 14c-3.31 0,-6,-2.69,-6,-6 0,-1.01.25,-1.97.7,-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4,-4,-4,-4v3z" /> +</vector>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_nextcloud_preferences.xml b/app/src/main/res/layout/activity_nextcloud_preferences.xml new file mode 100644 index 0000000..eff8ce5 --- /dev/null +++ b/app/src/main/res/layout/activity_nextcloud_preferences.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:orientation="vertical" + android:paddingBottom="@dimen/activity_vertical_margin" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + tools:context=".activities.NextcloudPreferencesActivity"> + + <!-- Login progress --> + <ProgressBar + android:id="@+id/login_progress" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:visibility="gone" + android:tooltipText="@string/prompt_checking_credentials"/> + + <!-- Credentials form --> + <ScrollView + android:id="@+id/login_form" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:id="@+id/email_login_form" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="66dp" + android:paddingTop="5dp" + android:text="@string/server_settings_description" /> + + <android.support.design.widget.TextInputLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <EditText + android:id="@+id/serverUrl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/prompt_serverUrl" + android:inputType="textUri" + android:maxLines="1" + android:singleLine="true" /> + + </android.support.design.widget.TextInputLayout> + + <android.support.design.widget.TextInputLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <EditText + android:id="@+id/username" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/prompt_username" + android:inputType="text" + android:maxLines="1" + android:singleLine="true" /> + + </android.support.design.widget.TextInputLayout> + + <android.support.design.widget.TextInputLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <EditText + android:id="@+id/password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/prompt_password" + android:imeActionId="6" + android:imeActionLabel="@string/action_save_credentials_short" + android:imeOptions="actionUnspecified" + android:inputType="textPassword" + android:maxLines="1" + android:singleLine="true" /> + + </android.support.design.widget.TextInputLayout> + + <Button + android:id="@+id/sign_in_button" + style="?android:textAppearanceSmall" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/action_save_credentials" + android:textStyle="bold" /> + + </LinearLayout> + </ScrollView> +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> +</adaptive-icon>
\ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_launcher_background"/> + <foreground android:drawable="@mipmap/ic_launcher_foreground"/> +</adaptive-icon>
\ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..f63e5c8 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 0000000..5c89aaf --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..bced8fa --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..387b8b5 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 0000000..9750a5b --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..a5531af --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..56a1055 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 0000000..76980b6 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..e0a278c --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..b2e1138 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 0000000..e90133a --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..4d5153c --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 0000000..e062e6b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png Binary files differnew file mode 100644 index 0000000..b5a231a --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 0000000..8a7d0a8 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#3F51B5</color> + <color name="colorPrimaryDark">#303F9F</color> + <color name="colorAccent">#FF4081</color> +</resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ +<resources> + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">16dp</dimen> + <dimen name="activity_vertical_margin">16dp</dimen> +</resources> diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..5cdbaab --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_launcher_background">#FF8000</color> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..dea7c92 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,29 @@ +<resources> + <string name="app_name">Nextcloud Share Bookmark</string> + <string name="sharing_label">Add Bookmark to Nextcloud</string> + + <string name="title_activity_nextcloud_preferences">Nextcloud Share Bookmark Settings</string> + + <!-- Labels related to preference screen --> + <string name="server_settings_description">Your credentials are needed to store a bookmark to your Nextcloud instance.</string> + <string name="prompt_username">Username</string> + <string name="prompt_password">Password</string> + <string name="prompt_serverUrl">Server URL</string> + + <!-- Save button on preference screen --> + <string name="action_save_credentials">Save credentials</string> + <string name="action_save_credentials_short">Save credentials</string> + + <!-- error message for preference screen --> + <string name="error_incorrect_password">This password is incorrect</string> + <string name="error_field_required">This field is required</string> + <string name="error_server_url_invalid">This server URL is invalid</string> + + + <string name="prompt_checking_credentials">Validating credentials</string> + + <!-- Messages for Toasts --> + <string name="toast_settings_update_success">Settings successfully updated</string> + <string name="toast_bookmark_add_success">Bookmark successfully set</string> + <string name="toast_bookmark_add_failed">Failed to set Bookmark</string> +</resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ +<resources> + + <!-- Base application theme. --> + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <!-- Customize your theme here. --> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="colorAccent">@color/colorAccent</item> + </style> + +</resources> diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml new file mode 100644 index 0000000..ccd7941 --- /dev/null +++ b/app/src/main/res/values/values.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="default_server_url">https://</string> + <string name="default_blank"/> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml new file mode 100644 index 0000000..3e5954d --- /dev/null +++ b/app/src/main/res/xml/preferences.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + <EditTextPreference + android:key="nextcloud_server_url" + android:title="Nextcloud URL" + android:defaultValue="https://"/> + <EditTextPreference + android:key="nextcloud_username" + android:title="Nextcloud Username"/> + <EditTextPreference + android:key="nextcloud_password" + android:title="Nextcloud Password"/> +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/test/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleUnitTest.java b/app/src/test/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleUnitTest.java new file mode 100644 index 0000000..75fc28e --- /dev/null +++ b/app/src/test/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package de.thedevstack.android.nextcloud.bookmark.share; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +}
\ No newline at end of file diff --git a/bookmarks.png b/bookmarks.png Binary files differnew file mode 100644 index 0000000..b70fe8c --- /dev/null +++ b/bookmarks.png diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..077cb2f --- /dev/null +++ b/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.4' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..743d692 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..7a3265e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9394686 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Nov 18 18:45:54 CET 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/logo.png b/logo.png Binary files differnew file mode 100644 index 0000000..a515aa7 --- /dev/null +++ b/logo.png diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app' |