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

Optimize imports a bit

Browse Source
This commit is contained in:
Daniel Martí 2015-04-06 22:16:51 +02:00
parent 3d55c0b45b
commit 0a11c4cd3e
14 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.Signature; import android.content.pm.Signature;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -644,7 +643,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
mInstalledSignature = pi.signatures[0]; mInstalledSignature = pi.signatures[0];
Hasher hash = new Hasher("MD5", mInstalledSignature.toCharsString().getBytes()); Hasher hash = new Hasher("MD5", mInstalledSignature.toCharsString().getBytes());
mInstalledSigID = hash.getHash(); mInstalledSigID = hash.getHash();
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.d(TAG, "Failed to get installed signature"); Log.d(TAG, "Failed to get installed signature");
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
Log.d(TAG, "Failed to calculate signature MD5 sum"); Log.d(TAG, "Failed to calculate signature MD5 sum");
@ -1237,7 +1236,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
Permission permission = new Permission(getActivity(), permissionName); Permission permission = new Permission(getActivity(), permissionName);
// TODO: Make this list RTL friendly // TODO: Make this list RTL friendly
sb.append("\t• ").append(permission.getName()).append('\n'); sb.append("\t• ").append(permission.getName()).append('\n');
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
if (permissionName.equals("ACCESS_SUPERUSER")) { if (permissionName.equals("ACCESS_SUPERUSER")) {
// TODO: i18n this string, but surely it is already translated somewhere? // TODO: i18n this string, but surely it is already translated somewhere?
sb.append("\t• Full permissions to all device features and storage\n"); sb.append("\t• Full permissions to all device features and storage\n");

3
F-Droid/src/org/fdroid/fdroid/FDroidApp.java
View File

@ -30,7 +30,6 @@ import android.content.ServiceConnection;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@ -263,7 +262,7 @@ public class FDroidApp extends Application {
break; break;
} }
} }
} catch (NameNotFoundException e1) { } catch (PackageManager.NameNotFoundException e1) {
e1.printStackTrace(); e1.printStackTrace();
found = false; found = false;
} }

3
F-Droid/src/org/fdroid/fdroid/NfcHelper.java
View File

@ -5,7 +5,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri; import android.net.Uri;
import android.nfc.NdefMessage; import android.nfc.NdefMessage;
import android.nfc.NdefRecord; import android.nfc.NdefRecord;
@ -48,7 +47,7 @@ public class NfcHelper {
Uri.parse("file://" + appInfo.publicSourceDir), Uri.parse("file://" + appInfo.publicSourceDir),
}; };
nfcAdapter.setBeamPushUris(uris, activity); nfcAdapter.setBeamPushUris(uris, activity);
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }

3
F-Droid/src/org/fdroid/fdroid/UpdateService.java
View File

@ -29,7 +29,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.OperationApplicationException; import android.content.OperationApplicationException;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.database.Cursor; import android.database.Cursor;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
@ -433,7 +432,7 @@ public class UpdateService extends IntentService implements ProgressListener {
} }
} }
Editor e = prefs.edit(); SharedPreferences.Editor e = prefs.edit();
e.putLong(Preferences.PREF_UPD_LAST, System.currentTimeMillis()); e.putLong(Preferences.PREF_UPD_LAST, System.currentTimeMillis());
e.commit(); e.commit();

4
F-Droid/src/org/fdroid/fdroid/Utils.java
View File

@ -19,7 +19,7 @@
package org.fdroid.fdroid; package org.fdroid.fdroid;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.net.Uri; import android.net.Uri;
@ -233,7 +233,7 @@ public final class Utils {
} }
eventType = xml.nextToken(); eventType = xml.nextToken();
} }
} catch (NameNotFoundException | IOException | XmlPullParserException e) { } catch (PackageManager.NameNotFoundException | IOException | XmlPullParserException e) {
e.printStackTrace(); e.printStackTrace();
} }
return 8; // some kind of hopeful default return 8; // some kind of hopeful default

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

@ -3,8 +3,10 @@ package org.fdroid.fdroid.data;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.pm.*; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.FeatureInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.os.Build; import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
@ -19,7 +21,10 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
import java.util.*; import java.util.Arrays;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
@ -209,7 +214,7 @@ public class App extends ValueObject implements Comparable<App> {
*/ */
@TargetApi(9) @TargetApi(9)
public App(Context context, PackageManager pm, String packageName) public App(Context context, PackageManager pm, String packageName)
throws CertificateEncodingException, IOException, NameNotFoundException { throws CertificateEncodingException, IOException, PackageManager.NameNotFoundException {
final ApplicationInfo appInfo = pm.getApplicationInfo(packageName, final ApplicationInfo appInfo = pm.getApplicationInfo(packageName,
PackageManager.GET_META_DATA); PackageManager.GET_META_DATA);
final PackageInfo packageInfo = pm.getPackageInfo(packageName, final PackageInfo packageInfo = pm.getPackageInfo(packageName,
@ -222,7 +227,7 @@ public class App extends ValueObject implements Comparable<App> {
ApplicationInfo installerAppInfo = pm.getApplicationInfo(installerPackageName, ApplicationInfo installerAppInfo = pm.getApplicationInfo(installerPackageName,
PackageManager.GET_META_DATA); PackageManager.GET_META_DATA);
installerPackageLabel = installerAppInfo.loadLabel(pm); installerPackageLabel = installerAppInfo.loadLabel(pm);
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.d(getClass().getCanonicalName(), e.getMessage()); Log.d(getClass().getCanonicalName(), e.getMessage());
} }
} }

15
F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
View File

@ -1,15 +1,24 @@
package org.fdroid.fdroid.data; package org.fdroid.fdroid.data;
import android.content.*; import android.content.Context;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import java.util.*;
public class AppProvider extends FDroidProvider { public class AppProvider extends FDroidProvider {
private static final String TAG = "fdroid.AppProvider"; private static final String TAG = "fdroid.AppProvider";

4
F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java
View File

@ -9,7 +9,7 @@ import android.os.Build;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.Map.Entry; import java.util.Map;
public abstract class FDroidProvider extends ContentProvider { public abstract class FDroidProvider extends ContentProvider {
@ -117,7 +117,7 @@ public abstract class FDroidProvider extends ContentProvider {
} }
Set<String> keySet = new HashSet<>(); Set<String> keySet = new HashSet<>();
for (Entry<String, Object> item : values.valueSet()) { for (Map.Entry<String, Object> item : values.valueSet()) {
String key = item.getKey(); String key = item.getKey();
keySet.add(key); keySet.add(key);
} }

7
F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java
View File

@ -5,8 +5,7 @@ import android.content.Context;
import android.content.UriMatcher; import android.content.UriMatcher;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
@ -100,9 +99,9 @@ public class InstalledAppProvider extends FDroidProvider {
try { try {
appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA); appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
return appInfo.loadLabel(pm).toString(); return appInfo.loadLabel(pm).toString();
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} catch (NotFoundException e) { } catch (Resources.NotFoundException e) {
Log.d(TAG, "getApplicationLabel: " + e.getMessage()); Log.d(TAG, "getApplicationLabel: " + e.getMessage());
} }
return packageName; // all else fails, return id return packageName; // all else fails, return id

6
F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java
View File

@ -1,6 +1,10 @@
package org.fdroid.fdroid.data; package org.fdroid.fdroid.data;
import android.content.*; import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
import android.content.UriMatcher;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.provider.BaseColumns; import android.provider.BaseColumns;

3
F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java
View File

@ -27,7 +27,6 @@ import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri; import android.net.Uri;
/** /**
@ -79,7 +78,7 @@ public class DefaultInstaller extends Installer {
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
throw new AndroidNotCompatibleException(e); throw new AndroidNotCompatibleException(e);
} }
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// already checked in super class // already checked in super class
} }
} }

3
F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java
View File

@ -28,7 +28,6 @@ import android.content.ActivityNotFoundException;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
@ -92,7 +91,7 @@ public class DefaultInstallerSdk14 extends Installer {
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {
throw new AndroidNotCompatibleException(e); throw new AndroidNotCompatibleException(e);
} }
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// already checked in super class // already checked in super class
} }
} }

3
F-Droid/src/org/fdroid/fdroid/installer/Installer.java
View File

@ -29,7 +29,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.util.Log; import android.util.Log;
/** /**
@ -219,7 +218,7 @@ abstract public class Installer {
// check if package exists before proceeding... // check if package exists before proceeding...
try { try {
mPm.getPackageInfo(packageName, 0); mPm.getPackageInfo(packageName, 0);
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Couldn't find package " + packageName + " to delete."); Log.e(TAG, "Couldn't find package " + packageName + " to delete.");
return; return;
} }

10
F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java
View File

@ -5,7 +5,6 @@ import android.content.SharedPreferences;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat; import android.graphics.Bitmap.CompressFormat;
@ -53,7 +52,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream; import java.util.jar.JarOutputStream;
@ -137,7 +135,7 @@ public class LocalRepoManager {
attemptToDelete(fdroidApkLink); attemptToDelete(fdroidApkLink);
if (Utils.symlinkOrCopyFile(apkFile, fdroidApkLink)) if (Utils.symlinkOrCopyFile(apkFile, fdroidApkLink))
fdroidClientURL = "/" + fdroidApkLink.getName(); fdroidClientURL = "/" + fdroidApkLink.getName();
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
return fdroidClientURL; return fdroidClientURL;
@ -258,7 +256,7 @@ public class LocalRepoManager {
return; return;
PackageInfo packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_META_DATA); PackageInfo packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_META_DATA);
app.icon = getIconFile(packageName, packageInfo.versionCode).getName(); app.icon = getIconFile(packageName, packageInfo.versionCode).getName();
} catch (NameNotFoundException | CertificateEncodingException | IOException e) { } catch (PackageManager.NameNotFoundException | CertificateEncodingException | IOException e) {
Log.e(TAG, "Error adding app to local repo: " + e.getMessage()); Log.e(TAG, "Error adding app to local repo: " + e.getMessage());
Log.e(TAG, Log.getStackTraceString(e)); Log.e(TAG, Log.getStackTraceString(e));
return; return;
@ -278,7 +276,7 @@ public class LocalRepoManager {
try { try {
appInfo = pm.getApplicationInfo(app.id, PackageManager.GET_META_DATA); appInfo = pm.getApplicationInfo(app.id, PackageManager.GET_META_DATA);
copyIconToRepo(appInfo.loadIcon(pm), app.id, app.installedApk.vercode); copyIconToRepo(appInfo.loadIcon(pm), app.id, app.installedApk.vercode);
} catch (NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@ -349,7 +347,7 @@ public class LocalRepoManager {
private void tagFdroid() throws IOException, LocalRepoKeyStore.InitException { private void tagFdroid() throws IOException, LocalRepoKeyStore.InitException {
serializer.startTag("", "fdroid"); serializer.startTag("", "fdroid");
tagRepo(); tagRepo();
for (Entry<String, App> entry : apps.entrySet()) { for (Map.Entry<String, App> entry : apps.entrySet()) {
tagApplication(entry.getValue()); tagApplication(entry.getValue());
} }
serializer.endTag("", "fdroid"); serializer.endTag("", "fdroid");