Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minsdk to be 8 instead of 7

Browse Source 
Java 1.7 is supported from 8, not 7, so we dropped support for 7 long ago.
Very few devices run 7 and quite a few things wouldn't work on 7 anyway.
This commit is contained in:
Daniel Martí 2015-05-19 13:08:55 +02:00
parent fc52e3e1c0
commit cbf59f9dd0
6 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/AndroidManifest.xml
View File

@ -9,7 +9,7 @@
<uses-sdk <uses-sdk
tools:overrideLibrary="org.thoughtcrime.ssl.pinning" tools:overrideLibrary="org.thoughtcrime.ssl.pinning"
android:minSdkVersion="7" android:minSdkVersion="8"
android:targetSdkVersion="21" android:targetSdkVersion="21"
/> />

2
F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java
View File

@ -15,8 +15,6 @@ import com.google.zxing.WriterException;
import com.google.zxing.encode.Contents; import com.google.zxing.encode.Contents;
import com.google.zxing.encode.QRCodeEncoder; import com.google.zxing.encode.QRCodeEncoder;
// zxing is android-8 and above
@TargetApi(8)
public class QrGenAsyncTask extends AsyncTask<String, Void, Void> { public class QrGenAsyncTask extends AsyncTask<String, Void, Void> {
private static final String TAG = "QrGenAsyncTask"; private static final String TAG = "QrGenAsyncTask";

5
F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
View File

@ -14,10 +14,7 @@ public class SupportedArchitectures extends Compatibility {
if (hasApi(21)) { if (hasApi(21)) {
return Build.SUPPORTED_ABIS; return Build.SUPPORTED_ABIS;
} }
if (hasApi(8)) { return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
}
return new String[]{Build.CPU_ABI};
} }
} }

10
F-Droid/src/org/fdroid/fdroid/data/App.java
View File

@ -8,7 +8,6 @@ import android.content.pm.FeatureInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@ -233,13 +232,8 @@ public class App extends ValueObject implements Comparable<App> {
else else
this.summary = (String) appDescription.subSequence(0, 40); this.summary = (String) appDescription.subSequence(0, 40);
this.id = appInfo.packageName; this.id = appInfo.packageName;
if (Build.VERSION.SDK_INT > 8) { this.added = new Date(packageInfo.firstInstallTime);
this.added = new Date(packageInfo.firstInstallTime); this.lastUpdated = new Date(packageInfo.lastUpdateTime);
this.lastUpdated = new Date(packageInfo.lastUpdateTime);
} else {
this.added = new Date(System.currentTimeMillis());
this.lastUpdated = this.added;
}
this.description = "<p>"; this.description = "<p>";
if (!TextUtils.isEmpty(appDescription)) if (!TextUtils.isEmpty(appDescription))
this.description += appDescription + "\n"; this.description += appDescription + "\n";

2
F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java
View File

@ -1,6 +1,5 @@
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.views.swap;
import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Intent; import android.content.Intent;
@ -170,7 +169,6 @@ public class ConnectSwapActivity extends ActionBarActivity implements ProgressLi
} }
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@TargetApi(8)
@Override @Override
protected Void doInBackground(Void... args) { protected Void doInBackground(Void... args) {
Uri repoUri = newRepoConfig.getRepoUri(); Uri repoUri = newRepoConfig.getRepoUri();

7
F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java
View File

@ -7,7 +7,6 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.graphics.LightingColorFilter; import android.graphics.LightingColorFilter;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.content.LocalBroadcastManager; 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); Log.i(TAG, "Encoded swap URI in QR Code: " + qrUriString);
// zxing requires >= 8 new QrGenAsyncTask(getActivity(), R.id.wifi_qr_code).execute(qrUriString);
// 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);
} }