diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java index c29e6ae36..34455797f 100644 --- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java +++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java @@ -33,6 +33,7 @@ import android.content.pm.PackageManager; import android.database.ContentObserver; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.support.annotation.NonNull; @@ -1112,7 +1113,10 @@ public class AppDetails extends AppCompatActivity { viewMorePermissions.setText(getString(R.string.less)); } else { description.setMaxLines(MAX_LINES); - description.setEllipsize(TextUtils.TruncateAt.MARQUEE); + if (Build.VERSION.SDK_INT > 10) { + // ellipsizing doesn't work properly here on 2.X + description.setEllipsize(TextUtils.TruncateAt.MARQUEE); + } viewMorePermissions.setText(R.string.more); } viewAllDescription ^= true; @@ -1133,7 +1137,10 @@ public class AppDetails extends AppCompatActivity { // If description has more than five lines if (description.getLineCount() > MAX_LINES) { description.setMaxLines(MAX_LINES); - description.setEllipsize(TextUtils.TruncateAt.MARQUEE); + if (Build.VERSION.SDK_INT > 10) { + // ellipsizing doesn't work properly here on 2.X + description.setEllipsize(TextUtils.TruncateAt.MARQUEE); + } description.setOnClickListener(expanderDescription); viewAllDescription = true; diff --git a/app/src/main/java/org/fdroid/fdroid/Utils.java b/app/src/main/java/org/fdroid/fdroid/Utils.java index fa6148ece..955ffa960 100644 --- a/app/src/main/java/org/fdroid/fdroid/Utils.java +++ b/app/src/main/java/org/fdroid/fdroid/Utils.java @@ -71,7 +71,6 @@ import java.util.zip.Adler32; public final class Utils { - @SuppressWarnings("UnusedDeclaration") private static final String TAG = "Utils"; private static final int BUFFER_SIZE = 4096; diff --git a/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java index fd79497bb..808acacd1 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java @@ -17,34 +17,33 @@ public abstract class ClipboardCompat { return new OldClipboard(); } -} + @TargetApi(11) + private static class HoneycombClipboard extends ClipboardCompat { -@TargetApi(11) -class HoneycombClipboard extends ClipboardCompat { + private final ClipboardManager manager; - private final ClipboardManager manager; - - HoneycombClipboard(Context context) { - this.manager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); - } - - @Override - public String getText() { - CharSequence text = null; - if (manager.hasPrimaryClip()) { - ClipData data = manager.getPrimaryClip(); - if (data.getItemCount() > 0) { - text = data.getItemAt(0).getText(); - } + HoneycombClipboard(Context context) { + this.manager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); + } + + @Override + public String getText() { + CharSequence text = null; + if (manager.hasPrimaryClip()) { + ClipData data = manager.getPrimaryClip(); + if (data.getItemCount() > 0) { + text = data.getItemAt(0).getText(); + } + } + return text != null ? text.toString() : null; + } + } + + private static class OldClipboard extends ClipboardCompat { + + @Override + public String getText() { + return null; } - return text != null ? text.toString() : null; - } -} - -class OldClipboard extends ClipboardCompat { - - @Override - public String getText() { - return null; } } diff --git a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java index f29b880e8..d483d36e4 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java @@ -181,15 +181,14 @@ public class DownloaderService extends Service { * message. */ private String getNotificationTitle(@Nullable String packageName) { - String title; if (packageName != null) { - App app = AppProvider.Helper.findByPackageName( + final App app = AppProvider.Helper.findByPackageName( getContentResolver(), packageName, new String[]{AppProvider.DataColumns.NAME}); - title = getString(R.string.downloading_apk, app.name); - } else { - title = getString(R.string.downloading); + if (app != null) { + return getString(R.string.downloading_apk, app.name); + } } - return title; + return getString(R.string.downloading); } public static PendingIntent createAppDetailsIntent(@NonNull Context context, int requestCode, @Nullable String packageName) { diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java index 8c37d6833..009a0399b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -227,9 +227,6 @@ public class SwapAppsView extends ListView implements private class AppListAdapter extends CursorAdapter { - @SuppressWarnings("UnusedDeclaration") - private static final String TAG = "AppListAdapter"; - private class ViewHolder { private final LocalBroadcastManager localBroadcastManager; diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 0040019ae..a1585a512 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -656,9 +656,6 @@ public class SwapWorkflowActivity extends AppCompatActivity { public static final int TYPE_COMPLETE = 1; public static final int TYPE_ERROR = 2; - @SuppressWarnings("UnusedDeclaration") - private static final String TAG = "UpdateAsyncTask"; - @NonNull protected final Set selectedApps; diff --git a/build.gradle b/build.gradle index e4f43b486..e02ad215c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.1.0' classpath files('libs/gradle-witness.jar') } } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index fb2da6279..8bb944a11 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -62,7 +62,7 @@ - +