kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #807 from ziegenberg/806-fix-scan-qr-code-on-android-11

Browse source 
Fix scan QR code on android 11
This commit is contained in:
Jakob Nixdorf 2021-04-15 06:50:08 +02:00 committed by GitHub
commit 8900e820d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/org/shadowice/flocke/andotp/Activities/SecureCaptureActivity.java
View file

@ -1,11 +1,35 @@
/*
* Copyright (C) 2019-2021 Jakob Nixdorf
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.shadowice.flocke.andotp.Activities;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import android.view.Window;
import android.view.WindowInsets;
import android.view.WindowInsetsController;
import android.view.WindowManager;
import com.journeyapps.barcodescanner.CaptureActivity;
import com.journeyapps.barcodescanner.DecoratedBarcodeView;
@ -14,6 +38,25 @@ import org.shadowice.flocke.andotp.Utilities.Settings;
import java.util.Locale;
public class SecureCaptureActivity extends CaptureActivity {
/**
* Overwrites {@link CaptureActivity#initializeContent()} to:
* <ul>
* <li>preventing the window from appearing in screenshots or from being viewed on
* non-secure displays, if this was enabled in the app settings.</li>
* <li>request hardware acceleration to be turned on.</li>
* <li>hide all screen decorations like navigation and status bars.</li>
* </ul>
*
* <em>
* Note:
* {@link android.app.Activity#setContentView(int)} in {@link CaptureActivity#initializeContent()}
* of super class needs to be called before {@link Window#getInsetsController()}, otherwise NPE will be thrown
* because the top-level view of the current {@link Window}, containing the window decor, is not yet initialized.
* </em>
*
* @return the DecoratedBarcodeView
*/
@Override
@SuppressWarnings("deprecation")
protected DecoratedBarcodeView initializeContent() {
@ -22,8 +65,19 @@ public class SecureCaptureActivity extends CaptureActivity {
setTheme(settings.getTheme());
setLocale(settings);
if (!settings.getScreenshotsEnabled())
// This flag must be set before setting the content view of the activity or dialog.
getWindow().setFlags(
WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED,
WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
);
// All window flags, that must be set before the window decoration is created, are already set
// so we are safe to call super here.
DecoratedBarcodeView barcodeScannerView = super.initializeContent();
if (!settings.getScreenshotsEnabled()) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
final WindowInsetsController insetsController = getWindow().getInsetsController();
@ -32,12 +86,13 @@ public class SecureCaptureActivity extends CaptureActivity {
insetsController.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
}
} else {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
getWindow().setFlags(
WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN
);
}
getWindow().setFlags(WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED);
return super.initializeContent();
return barcodeScannerView;
}
private void setLocale(Settings settings) {