cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate to androidx

Browse Source
This commit is contained in:
Vincent Breitmoser
2019-11-15 12:09:08 +01:00
parent 5cd210831b
commit 5172002f0e
343 changed files with 946 additions and 2335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/CharsetVerifier.java
View File

@@ -26,8 +26,8 @@ import java.nio.charset.CoderResult;
import java.nio.charset.CodingErrorAction;
import android.content.ClipDescription;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/** This class can be used to guess whether a stream of data is encoded in a given
* charset or not.

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
View File

@@ -43,7 +43,7 @@ import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.Email;
import android.provider.ContactsContract.CommonDataKinds.Im;
import android.provider.ContactsContract.Data;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.util.Patterns;
import org.sufficientlysecure.keychain.Constants;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/CountingOutputStream.java
View File

@@ -19,7 +19,7 @@ import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
public final class CountingOutputStream extends FilterOutputStream {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/DatabaseUtil.java
View File

@@ -18,7 +18,7 @@
package org.sufficientlysecure.keychain.util;
import android.arch.persistence.db.SupportSQLiteDatabase;
import androidx.sqlite.db.SupportSQLiteDatabase;
import android.database.Cursor;
import android.text.TextUtils;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/FileHelper.java
View File

@@ -49,7 +49,7 @@ import android.os.Build.VERSION_CODES;
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.OpenableColumns;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.widget.Toast;
import org.sufficientlysecure.keychain.R;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java
View File

@@ -17,7 +17,7 @@
package org.sufficientlysecure.keychain.util;
import android.content.Intent;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import com.google.zxing.integration.android.IntentIntegrator;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Numeric9x4PassphraseUtil.java
View File

@@ -23,7 +23,7 @@ import java.security.SecureRandom;
import java.util.Random;
import java.util.regex.Pattern;
import android.support.annotation.VisibleForTesting;
import androidx.annotation.VisibleForTesting;
// see https://autocrypt.org/level1.html#setup-code
public class Numeric9x4PassphraseUtil {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableHashMap.java
View File

@@ -22,7 +22,7 @@ import java.util.HashMap;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import org.sufficientlysecure.keychain.KeychainApplication;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java
View File

@@ -23,7 +23,7 @@ import java.net.Proxy;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
/**
* used to simply transport java.net.Proxy objects created using InetSockets between services/activities

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
View File

@@ -29,7 +29,7 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Parcelable;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.google.auto.value.AutoValue;
import org.sufficientlysecure.keychain.Constants;

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ResourceUtils.java
View File

@@ -6,9 +6,9 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.v4.content.ContextCompat;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
public class ResourceUtils {

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareKeyHelper.java
View File

@@ -31,7 +31,7 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.ParcelFileDescriptor;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/WebKeyDirectoryUtil.java
View File

@@ -1,6 +1,6 @@
package org.sufficientlysecure.keychain.util;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;