re-merge libkeychain

OpenKeychain/build.gradle

@@ -53,7 +53,6 @@ dependencies {
     implementation 'org.piwik.sdk:piwik-sdk:3.0.3'
 
     // libs as submodules
-    implementation project(':libkeychain')
     implementation project(':openpgp-api-lib')
     implementation project(':nfcsweetspot')
     implementation project(':sshauthentication-api')

OpenKeychain/src/main/java/org/bouncycastle/openpgp/operator/jcajce/NfcSyncPGPContentSignerBuilder.java

@@ -16,8 +16,6 @@ import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.security.Provider;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java

@@ -13,7 +13,6 @@ import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.BuildConfig;
-import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.KeychainApplication;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.SettingsActivity;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RequestKeyPermissionActivity.java

@@ -36,9 +36,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.openintents.openpgp.util.OpenPgpUtils.UserId;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo;
 import org.sufficientlysecure.keychain.remote.ui.RequestKeyPermissionPresenter.RequestKeyPermissionMvpView;
 import org.sufficientlysecure.keychain.ui.dialog.CustomAlertDialogBuilder;
 import org.sufficientlysecure.keychain.ui.util.KeyInfoFormatter;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/NfcTransport.java

@@ -19,13 +19,10 @@ package org.sufficientlysecure.keychain.securitytoken;
 
 import android.nfc.Tag;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
-import org.bouncycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
 import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TransportType;
-import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
 
 import java.io.IOException;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/ContactSyncAdapterService.java

@@ -18,7 +18,6 @@
 package org.sufficientlysecure.keychain.service;
 
 
-import android.Manifest;
 import android.accounts.Account;
 import android.app.PendingIntent;
 import android.app.Service;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java

@@ -35,8 +35,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyFingerprintActivity.java

@@ -18,10 +18,7 @@
 package org.sufficientlysecure.keychain.ui;
 
 import android.arch.lifecycle.ViewModelProviders;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
-import android.view.View;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.base.BaseActivity;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenAlgorithmFragment.java

@@ -32,7 +32,6 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.securitytoken.KeyFormat;
-import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.util.Choice;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenPinFragment.java

@@ -30,7 +30,6 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.util.Passphrase;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java

@@ -42,12 +42,8 @@ import org.sufficientlysecure.keychain.livedata.GenericLiveData;
 import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo;
 import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput;
 import org.sufficientlysecure.keychain.ui.chips.EncryptRecipientChipsInput.EncryptRecipientChip;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
-import org.sufficientlysecure.keychain.ui.util.Notify;
-import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.ui.widget.KeySpinner;
 import org.sufficientlysecure.keychain.util.Passphrase;
-import timber.log.Timber;
 
 
 public class EncryptModeAsymmetricFragment extends EncryptModeFragment {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java

@@ -22,10 +22,8 @@ import java.io.IOException;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
 import android.widget.Toast;
 
 import org.apache.james.mime4j.util.MimeUtil;
@@ -34,7 +32,6 @@ import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 import org.sufficientlysecure.keychain.ui.util.Notify.Style;
 import org.sufficientlysecure.keychain.util.FileHelper;
-import timber.log.Timber;
 
 
 public class EncryptTextActivity extends EncryptActivity {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsSmartPGPAuthoritiesActivity.java

@@ -27,13 +27,9 @@ import org.sufficientlysecure.keychain.ui.base.BaseActivity;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
+
 
 public class SettingsSmartPGPAuthoritiesActivity extends BaseActivity {
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/FlexibleKeyHeader.java

@@ -7,7 +7,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import eu.davidea.flexibleadapter.FlexibleAdapter;
-import eu.davidea.flexibleadapter.items.AbstractHeaderItem;
 import eu.davidea.flexibleadapter.items.IFlexible;
 import eu.davidea.flexibleadapter.items.IHeader;
 import eu.davidea.viewholders.FlexibleViewHolder;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SubkeyAddedItem.java

@@ -18,27 +18,20 @@
 package org.sufficientlysecure.keychain.ui.adapter;
 
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 
-import android.content.Context;
-import android.graphics.Typeface;
-import android.text.format.DateFormat;
 import android.view.View;
 
 import eu.davidea.flexibleadapter.FlexibleAdapter;
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
 import eu.davidea.flexibleadapter.items.IFlexible;
-import org.bouncycastle.bcpg.sig.KeyFlags;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey.SecretKeyType;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyAdd;
 import org.sufficientlysecure.keychain.ui.SubKeyItem.SubkeyViewHolder;
 import org.sufficientlysecure.keychain.ui.ViewKeyAdvSubkeysFragment;
 import org.sufficientlysecure.keychain.ui.ViewKeyAdvSubkeysFragment.SubkeyEditViewModel;
-import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 
 
 public class SubkeyAddedItem extends AbstractFlexibleItem<SubkeyViewHolder> {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/IdentitiesCardView.java

@@ -26,7 +26,6 @@ import android.support.v7.widget.RecyclerView.AdapterDataObserver;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.Button;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.adapter.IdentityAdapter;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferFragment.java

@@ -28,7 +28,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/FormattingUtils.java

@@ -19,9 +19,6 @@ package org.sufficientlysecure.keychain.ui.util;
 
 import android.content.Context;
 import android.content.res.Resources.Theme;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.StrikethroughSpan;
 import android.util.TypedValue;
 
 public class FormattingUtils {

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java

@@ -52,7 +52,6 @@ import android.provider.OpenableColumns;
 import android.support.v4.app.Fragment;
 import android.widget.Toast;
 
-import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import timber.log.Timber;
 

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java

@@ -12,7 +12,6 @@ package org.sufficientlysecure.keychain.util;
 
 import android.os.Build;
 import android.os.Process;
-import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Utf8Util.java

@@ -17,7 +17,7 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import org.sufficientlysecure.keychain.LibConstants;
+import org.sufficientlysecure.keychain.Constants;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.CharacterCodingException;
@@ -49,7 +49,7 @@ public class Utf8Util {
         try {
             return charsetDecoder.decode(ByteBuffer.wrap(input)).toString();
         } catch (CharacterCodingException e) {
-            Log.e(LibConstants.TAG, "Decoding failed!", e);
+            Log.e(Constants.TAG, "Decoding failed!", e);
             return charsetDecoder.replacement();
         }
     }

libkeychain/.gitignore

@@ -1,33 +0,0 @@
-#Android specific
-bin
-gen
-obj
-lint.xml
-local.properties
-release.properties
-ant.properties
-*.class
-*.apk
-
-#Gradle
-.gradle
-build
-gradle.properties
-
-#Maven
-target
-pom.xml.*
-
-#Eclipse
-.project
-.classpath
-.settings
-.metadata
-
-#IntelliJ IDEA
-.idea
-*.iml
-
-#Lint output
-lint-report.html
-lint-report_files/*

libkeychain/build.gradle

@@ -1,40 +0,0 @@
-apply plugin: 'com.android.library'
-
-dependencies {
-    // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
-    // NOTE: libraries are pinned to a specific build, see below
-
-    // from local Android SDK
-    compile 'com.android.support:support-v4:27.0.2'
-
-    // libs as submodules
-    compile project(':openpgp-api-lib') // TODO: get rid of this dependency
-    compile project(':extern:bouncycastle:core')
-    compile project(':extern:bouncycastle:pg')
-    compile project(':extern:bouncycastle:prov')
-
-    // Unit tests in the local JVM with Robolectric
-    // https://developer.android.com/training/testing/unit-testing/local-unit-tests.html
-    // http://robolectric.org/getting-started/
-    // http://www.vogella.com/tutorials/Robolectric/article.html
-    testCompile 'junit:junit:4.12'
-    testCompile ('org.robolectric:robolectric:3.2.2') {
-        exclude group: 'org.bouncycastle', module: 'bcprov-jdk16'
-    }
-    testCompile 'org.mockito:mockito-core:1.10.19'
-
-}
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion 14
-    }
-
-    // Do not abort build if lint finds errors
-    lintOptions {
-        abortOnError false
-    }
-}

libkeychain/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.sufficientlysecure.libkeychain" />

libkeychain/src/main/java/org/sufficientlysecure/keychain/LibConstants.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2017 Dominik Schürmann <dominik@dominikschuermann.de>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.sufficientlysecure.libkeychain.BuildConfig;
-
-public final class LibConstants {
-
-    public static final boolean DEBUG = BuildConfig.DEBUG;
-
-    public static final String TAG = DEBUG ? "Keychain D" : "Keychain";
-
-    public static final String BOUNCY_CASTLE_PROVIDER_NAME = BouncyCastleProvider.PROVIDER_NAME;
-
-}

settings.gradle

@@ -1,5 +1,4 @@
 include ':OpenKeychain'
-include ':libkeychain'
 include ':nfcsweetspot'
 include ':extern:bouncycastle:core'
 include ':extern:bouncycastle:pg'