Merge pull request #56 from mgeier63/master

fixes
oversecio · Mar 2, 2019 · 5c68df8 · 5c68df8
2 parents 24b1cd7 + 2d018b1
commit 5c68df8
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git 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()

diff --git 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);

diff --git 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;

diff --git 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
@@ -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

diff --git 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
 

diff --git a/libraries/oversec_crypto b/libraries/oversec_crypto