From 068281dd60a3a05deb9df2a0dc4c8de61dc17a6d Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Fri, 1 Mar 2019 23:05:18 +0700 Subject: [PATCH 1/6] fixes #53 --- app/src/main/java/io/oversec/one/Core.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/oversec/one/Core.java b/app/src/main/java/io/oversec/one/Core.java index 92058e5..d581cd8 100644 --- a/app/src/main/java/io/oversec/one/Core.java +++ b/app/src/main/java/io/oversec/one/Core.java @@ -541,7 +541,9 @@ private void doTemporaryHide_UI(TemporaryHideParams p) { showOrUpdateNotification_UI(); if (!hide) { - mOversecAccessibilityService.sendScrapeAllMessage("doTemporaryHide_UI", null); + if (mOversecAccessibilityService!=null) { + mOversecAccessibilityService.sendScrapeAllMessage("doTemporaryHide_UI", null); + } } else { mOverlays.refreshDecrypt(null); mEncryptionCache.clear(EncryptionCache.CLEAR_REASON.OVERSEC_HIDDEN, null); From 895644b93ecfe4f2431cde1352f5a95ab7dc2396 Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Fri, 1 Mar 2019 23:44:50 +0700 Subject: [PATCH 2/6] fixes #52 --- .../java/io/oversec/one/ovl/AbstractOverlayButtonView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/oversec/one/ovl/AbstractOverlayButtonView.java b/app/src/main/java/io/oversec/one/ovl/AbstractOverlayButtonView.java index b66f40d..d17bec7 100644 --- a/app/src/main/java/io/oversec/one/ovl/AbstractOverlayButtonView.java +++ b/app/src/main/java/io/oversec/one/ovl/AbstractOverlayButtonView.java @@ -139,7 +139,6 @@ protected int getMyHeight() { public boolean onTouchHandleMove( MotionEvent event) { - int totalDeltaX = touchInfo.lastX - touchInfo.firstX; int totalDeltaY = touchInfo.lastY - touchInfo.firstY; @@ -156,7 +155,6 @@ public boolean onTouchHandleMove( break; case MotionEvent.ACTION_MOVE: - int deltaX = (int) event.getRawX() - touchInfo.lastX; int deltaY = (int) event.getRawY() - touchInfo.lastY; @@ -170,6 +168,10 @@ public boolean onTouchHandleMove( mHandler.removeMessages(WHAT_LONG_TAP); mHandler.removeMessages(WHAT_SINGLE_TAP); + if (mCore.isTemporaryHidden_UI(mPackageName)) { + return true; + } + // update the position of the window if (event.getPointerCount() == 1) { mLayoutParams.x += deltaX; From 41031ea33982d5b3edba9354850a1007950ece50 Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Sat, 2 Mar 2019 10:28:30 +0700 Subject: [PATCH 3/6] fixes #55 --- app/src/main/java/io/oversec/one/ui/HelpFragment.java | 3 +++ .../oversec/one/ui/encparams/GpgEncryptionParamsFragment.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/io/oversec/one/ui/HelpFragment.java b/app/src/main/java/io/oversec/one/ui/HelpFragment.java index 431441f..041d019 100644 --- a/app/src/main/java/io/oversec/one/ui/HelpFragment.java +++ b/app/src/main/java/io/oversec/one/ui/HelpFragment.java @@ -218,6 +218,9 @@ public void onClick(View v) { mVgOkc = (ViewGroup) v.findViewById(R.id.settings_okc); mTvOkcStatus = (TextView) v.findViewById(R.id.okc_status); Button btInstallOkcFdroid = (Button) v.findViewById(R.id.btn_okc_fdroid); + + btInstallOkcFdroid.setVisibility(BuildConfig.IS_FRDOID?View.VISIBLE:View.GONE); + btInstallOkcFdroid.setOnClickListener(new OnClickListener() { @Override diff --git a/app/src/main/java/io/oversec/one/ui/encparams/GpgEncryptionParamsFragment.java b/app/src/main/java/io/oversec/one/ui/encparams/GpgEncryptionParamsFragment.java index e31b901..3eeffdf 100644 --- a/app/src/main/java/io/oversec/one/ui/encparams/GpgEncryptionParamsFragment.java +++ b/app/src/main/java/io/oversec/one/ui/encparams/GpgEncryptionParamsFragment.java @@ -25,6 +25,7 @@ import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; +import io.oversec.one.BuildConfig; import io.oversec.one.Core; import io.oversec.one.common.CoreContract; import io.oversec.one.crypto.AbstractEncryptionParams; @@ -284,6 +285,8 @@ private void checkVisibilities() { mBtnInstallPlay.setVisibility(OpenKeychainConnector.Companion.getInstance(getActivity()).isGooglePlayInstalled() ? View.VISIBLE : View.GONE); + mBtnInstallFdroid.setVisibility(BuildConfig.IS_FRDOID?View.VISIBLE:View.GONE); + if (mBtnInstallPlay.getVisibility() == View.VISIBLE) { mBtnInstallPlay.setOnClickListener(new View.OnClickListener() { @Override From a2d4d8e6db56fd55a14f394bb1b76e795aac7254 Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Sat, 2 Mar 2019 10:41:24 +0700 Subject: [PATCH 4/6] lib update --- libraries/oversec_crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/oversec_crypto b/libraries/oversec_crypto index 8de9f4a..9040ab6 160000 --- a/libraries/oversec_crypto +++ b/libraries/oversec_crypto @@ -1 +1 @@ -Subproject commit 8de9f4aba9a3265cd552b74ee38971b24baf46f4 +Subproject commit 9040ab646c7ab1ec9d1e2fff05782e07b5547547 From f9b6f3cc3bfefb764201e9c625737763b04e90d4 Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Sat, 2 Mar 2019 10:47:12 +0700 Subject: [PATCH 5/6] updated changelog --- app/src/main/res/raw/changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/res/raw/changelog.md b/app/src/main/res/raw/changelog.md index c92731d..fa27fc8 100644 --- a/app/src/main/res/raw/changelog.md +++ b/app/src/main/res/raw/changelog.md @@ -1,3 +1,7 @@ +### 1.5.14 +- fixed some crashes (race conditions) +- buttons can not be dragged anymore when hidden + ### 1.5.13 - fixed a spurious crash when importing keys From 2d018b1915833df21dfd060bfed1521c61e9fcc8 Mon Sep 17 00:00:00 2001 From: Marco Geier Date: Sat, 2 Mar 2019 10:54:41 +0700 Subject: [PATCH 6/6] up version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4cab886..192eb45 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,8 +53,8 @@ android { targetSdkVersion 28 //hardcoded for F-droid bot - versionCode = 1005013 - versionName = "1.5.13" + versionCode = 1005014 + versionName = "1.5.14" //still need to make sure this is in sync with the git tags def versionCodeFromGit = androidGitVersion.code()