diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml index 8f40f2277..402629bd5 100644 --- a/F-Droid/AndroidManifest.xml +++ b/F-Droid/AndroidManifest.xml @@ -9,7 +9,7 @@ diff --git a/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java b/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java index d11931561..4c5a9f544 100644 --- a/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java +++ b/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java @@ -15,8 +15,6 @@ import com.google.zxing.WriterException; import com.google.zxing.encode.Contents; import com.google.zxing.encode.QRCodeEncoder; -// zxing is android-8 and above -@TargetApi(8) public class QrGenAsyncTask extends AsyncTask { private static final String TAG = "QrGenAsyncTask"; diff --git a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java index b1326c3ed..8a8310fbb 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java @@ -14,10 +14,7 @@ public class SupportedArchitectures extends Compatibility { if (hasApi(21)) { return Build.SUPPORTED_ABIS; } - if (hasApi(8)) { - return new String[]{Build.CPU_ABI, Build.CPU_ABI2}; - } - return new String[]{Build.CPU_ABI}; + return new String[]{Build.CPU_ABI, Build.CPU_ABI2}; } } diff --git a/F-Droid/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java index 785b1246c..caa3f34ad 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/App.java +++ b/F-Droid/src/org/fdroid/fdroid/data/App.java @@ -8,7 +8,6 @@ import android.content.pm.FeatureInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.database.Cursor; -import android.os.Build; import android.text.TextUtils; import android.util.Log; @@ -233,13 +232,8 @@ public class App extends ValueObject implements Comparable { else this.summary = (String) appDescription.subSequence(0, 40); this.id = appInfo.packageName; - if (Build.VERSION.SDK_INT > 8) { - this.added = new Date(packageInfo.firstInstallTime); - this.lastUpdated = new Date(packageInfo.lastUpdateTime); - } else { - this.added = new Date(System.currentTimeMillis()); - this.lastUpdated = this.added; - } + this.added = new Date(packageInfo.firstInstallTime); + this.lastUpdated = new Date(packageInfo.lastUpdateTime); this.description = "

"; if (!TextUtils.isEmpty(appDescription)) this.description += appDescription + "\n"; diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java index 010c56126..aab818f48 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java @@ -1,6 +1,5 @@ package org.fdroid.fdroid.views.swap; -import android.annotation.TargetApi; import android.app.Activity; import android.content.ContentValues; import android.content.Intent; @@ -170,7 +169,6 @@ public class ConnectSwapActivity extends ActionBarActivity implements ProgressLi } new AsyncTask() { - @TargetApi(8) @Override protected Void doInBackground(Void... args) { Uri repoUri = newRepoConfig.getRepoUri(); diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java index 133c7c688..ecb7d70ca 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.graphics.LightingColorFilter; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.content.LocalBroadcastManager; @@ -158,11 +157,7 @@ public class WifiQrFragment extends Fragment { Log.i(TAG, "Encoded swap URI in QR Code: " + qrUriString); - // zxing requires >= 8 - // TODO: What about 7? I don't feel comfortable bumping the min version for this... - // I would suggest show some alternate info, with directions for how to add a new repository manually. - if (Build.VERSION.SDK_INT >= 8) - new QrGenAsyncTask(getActivity(), R.id.wifi_qr_code).execute(qrUriString); + new QrGenAsyncTask(getActivity(), R.id.wifi_qr_code).execute(qrUriString); }