From 9a16c9609610bd9dd7969cdc9048724ccfbdffdc Mon Sep 17 00:00:00 2001 From: steckbrief Date: Mon, 26 Nov 2018 23:56:45 +0100 Subject: first version of NextcloudShareBookmark --- .gitignore | 8 + app/.gitignore | 1 + app/build.gradle | 29 ++++ app/proguard-rules.pro | 21 +++ .../bookmark/share/ExampleInstrumentedTest.java | 26 +++ app/src/main/AndroidManifest.xml | 33 ++++ app/src/main/ic_launcher-web.png | Bin 0 -> 25564 bytes .../nextcloud/bookmark/share/Constants.java | 9 ++ .../bookmark/share/NextcloudBookmark.java | 42 +++++ .../bookmark/share/NextcloudBookmarkService.java | 25 +++ .../activities/AppCompatPreferenceActivity.java | 109 +++++++++++++ .../activities/NextcloudBookmarkShareActivity.java | 51 ++++++ .../activities/NextcloudPreferencesActivity.java | 180 +++++++++++++++++++++ .../share/async/NextcloudAddBookmarkAsyncTask.java | 40 +++++ .../async/NextcloudBookmarkRestAsyncTask.java | 30 ++++ .../share/async/NextcloudCheckCredentialsTask.java | 76 +++++++++ .../share/rest/NextcloudBookmarkRestClient.java | 100 ++++++++++++ .../res/drawable-v24/ic_launcher_foreground.xml | 34 ++++ app/src/main/res/drawable/ic_info_black_24dp.xml | 9 ++ .../main/res/drawable/ic_launcher_background.xml | 170 +++++++++++++++++++ .../res/drawable/ic_notifications_black_24dp.xml | 9 ++ app/src/main/res/drawable/ic_sync_black_24dp.xml | 9 ++ .../res/layout/activity_nextcloud_preferences.xml | 101 ++++++++++++ app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2017 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 2253 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 3958 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1404 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 1311 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2544 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 2821 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 3342 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 5644 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 4528 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 5972 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 9017 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 6484 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 9285 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 13314 bytes app/src/main/res/values/colors.xml | 6 + app/src/main/res/values/dimens.xml | 5 + app/src/main/res/values/ic_launcher_background.xml | 4 + app/src/main/res/values/strings.xml | 29 ++++ app/src/main/res/values/styles.xml | 11 ++ app/src/main/res/values/values.xml | 5 + app/src/main/res/xml/preferences.xml | 13 ++ .../nextcloud/bookmark/share/ExampleUnitTest.java | 17 ++ bookmarks.png | Bin 0 -> 503 bytes build.gradle | 27 ++++ gradle.properties | 13 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 ++++++++++++++++++++ gradlew.bat | 84 ++++++++++ logo.png | Bin 0 -> 15921 bytes settings.gradle | 1 + 57 files changed, 1515 insertions(+) create mode 100644 .gitignore create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleInstrumentedTest.java create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/Constants.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmark.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/NextcloudBookmarkService.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/AppCompatPreferenceActivity.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudBookmarkShareActivity.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/activities/NextcloudPreferencesActivity.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudAddBookmarkAsyncTask.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudBookmarkRestAsyncTask.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/async/NextcloudCheckCredentialsTask.java create mode 100644 app/src/main/java/de/thedevstack/android/nextcloud/bookmark/share/rest/NextcloudBookmarkRestClient.java create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml create mode 100644 app/src/main/res/layout/activity_nextcloud_preferences.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/ic_launcher_background.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/styles.xml create mode 100644 app/src/main/res/values/values.xml create mode 100644 app/src/main/res/xml/preferences.xml create mode 100644 app/src/test/java/de/thedevstack/android/nextcloud/bookmark/share/ExampleUnitTest.java create mode 100644 bookmarks.png create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 logo.png create mode 100644 settings.gradle 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 Testing documentation + */ +@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 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..fac28b1 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ 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 { + + 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 extends AsyncTask { + 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 { + 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 @@ + + + + + + + + + + + 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 @@ + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + 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 @@ + + + \ 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +