From 7aef29eb4b901e18c74212d3619d10b73f8f1779 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Thu, 2 Jan 2020 17:07:31 +0100 Subject: [PATCH 1/4] remove a crash --- .../com/owncloud/android/services/OperationsService.java | 6 ++---- .../com/owncloud/android/services/SyncFolderHandler.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/services/OperationsService.java b/owncloudApp/src/main/java/com/owncloud/android/services/OperationsService.java index 77163abcb2b..1b5a0278bf3 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/services/OperationsService.java +++ b/owncloudApp/src/main/java/com/owncloud/android/services/OperationsService.java @@ -204,10 +204,8 @@ public void onDestroy() { saveAllClients(this, MainApp.Companion.getAccountType()); // TODO - get rid of these exceptions - } catch ( - AccountNotFoundException | AuthenticatorException | - OperationCanceledException | IOException e) { - e.printStackTrace(); + } catch (AccountNotFoundException | AuthenticatorException | OperationCanceledException | IOException e) { + Timber.e(e); } mUndispatchedFinishedOperations.clear(); diff --git a/owncloudApp/src/main/java/com/owncloud/android/services/SyncFolderHandler.java b/owncloudApp/src/main/java/com/owncloud/android/services/SyncFolderHandler.java index d0f41679766..a88e9ea5c1e 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/services/SyncFolderHandler.java +++ b/owncloudApp/src/main/java/com/owncloud/android/services/SyncFolderHandler.java @@ -128,7 +128,7 @@ private void doOperation(Account account, String remotePath) { mService.dispatchResultToOperationListeners(mCurrentSyncOperation, result); - sendBroadcastFinishedSyncFolder(account, remotePath, result.isSuccess()); + sendBroadcastFinishedSyncFolder(account, remotePath, result != null && result.isSuccess()); } } } From bc900fdcd1e313d7cf6b53de128bddbc9248f340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Mon, 20 Jan 2020 12:54:18 +0100 Subject: [PATCH 2/4] Fix crash when trying to connect to self signed certificate --- .../authentication/AuthenticatorActivity.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index 29f5358288e..6079a59d9d9 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -115,7 +115,7 @@ */ public class AuthenticatorActivity extends AccountAuthenticatorActivity implements OnRemoteOperationListener, OnFocusChangeListener, OnEditorActionListener, - AuthenticatorAsyncTask.OnAuthenticatorTaskListener { + AuthenticatorAsyncTask.OnAuthenticatorTaskListener, SslUntrustedCertDialog.OnSslUntrustedCertListener { public static final String EXTRA_ACTION = "ACTION"; public static final String EXTRA_ACCOUNT = "ACCOUNT"; @@ -1689,6 +1689,23 @@ public boolean onEditorAction(TextView inputField, int actionId, KeyEvent event) return false; // always return false to grant that the software keyboard is hidden anyway } + @Override + public void onSavedCertificate() { + Log_OC.d("Server certificate is trusted"); + checkOcServer(); + } + + @Override + public void onFailedSavingCertificate() { + Log_OC.d("Server certificate could not be saved"); + Toast.makeText(this, R.string.ssl_validator_not_saved, Toast.LENGTH_LONG).show(); + } + + @Override + public void onCancelCertificate() { + Log_OC.d("Server certificate is not trusted"); + } + private abstract static class RightDrawableOnTouchListener implements OnTouchListener { /** From 7537164cd2a1bc515919df9ca1975b58aa9a1f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Wed, 22 Jan 2020 13:25:08 +0100 Subject: [PATCH 3/4] Update versionName, versionCode and changelog --- CHANGELOG.md | 3 +++ owncloudApp/build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2f2f64d072..a77bd7ee0e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.14.2 (January 2020) +- Fix crash triggered when trying to connect to server secured with self signed certificate + ## 2.14.1 (December 2019) - Some improvements in wizard diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index e1bc7e562cb..2ad33dd533d 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -104,8 +104,8 @@ android { testInstrumentationRunner "com.owncloud.android.utils.OCTestAndroidJUnitRunner" - versionCode = 21400100 - versionName = "2.14.1" + versionCode = 21400200 + versionName = "2.14.2" buildConfigField "String", gitRemote, "\"" + getGitOriginRemote() + "\"" buildConfigField "String", commitSHA1, "\"" + getLatestGitHash() + "\"" From c166e4e263ac9aa6fc4485bc8d0ed4eb072bd55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garc=C3=ADa=20de=20Prada?= Date: Wed, 29 Jan 2020 12:57:40 +0100 Subject: [PATCH 4/4] Update library reference Rebase with master --- owncloud-android-library | 2 +- .../android/authentication/AuthenticatorActivity.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/owncloud-android-library b/owncloud-android-library index 4cd317d929a..6df51cc3233 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 4cd317d929af90034370e5183cd6322ee64435af +Subproject commit 6df51cc32332268cda98c6a54a0177baebeca4de diff --git a/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java index 6079a59d9d9..e6e4161e42e 100644 --- a/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/owncloudApp/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -1691,19 +1691,19 @@ public boolean onEditorAction(TextView inputField, int actionId, KeyEvent event) @Override public void onSavedCertificate() { - Log_OC.d("Server certificate is trusted"); + Timber.d("Server certificate is trusted"); checkOcServer(); } @Override public void onFailedSavingCertificate() { - Log_OC.d("Server certificate could not be saved"); + Timber.d("Server certificate could not be saved"); Toast.makeText(this, R.string.ssl_validator_not_saved, Toast.LENGTH_LONG).show(); } @Override public void onCancelCertificate() { - Log_OC.d("Server certificate is not trusted"); + Timber.d("Server certificate is not trusted"); } private abstract static class RightDrawableOnTouchListener implements OnTouchListener {