Cleanup some Android Studio lint warnings

termux · Aug 28, 2018 · 033e4df · 033e4df
1 parent 75c48ad
commit 033e4df
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 102 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Material.Light" >
+        android:theme="@android:style/Theme.Material.Light"
+        tools:ignore="GoogleAppIndexingWarning">
         <receiver android:name="com.termux.api.TermuxApiReceiver"/>
         <activity android:name="com.termux.api.DialogActivity" android:theme="@style/DialogTheme" android:noHistory="true" android:excludeFromRecents="true" android:exported="false"/>
         <activity android:name=".FingerprintAPI$FingerprintActivity" android:theme="@android:style/Theme.NoDisplay"

diff --git a/app/src/main/java/com/termux/api/DialogActivity.java b/app/src/main/java/com/termux/api/DialogActivity.java
@@ -94,8 +94,6 @@ protected void onDestroy() {
 
     /**
      * Extract value extras from intent into String array
-     * @param intent
-     * @return
      */
     static String[] getInputValues(Intent intent) {
         String[] items = new String[] { };
@@ -115,8 +113,6 @@ static String[] getInputValues(Intent intent) {
 
     /**
      * Writes the InputResult to the console
-     * @param context
-     * @param result
      */
     protected void postResult(final Context context, final InputResult result) {
         ResultReturner.returnData(context, getIntent(), new ResultReturner.ResultJsonWriter() {
@@ -692,7 +688,6 @@ protected InputMethodManager getInputMethodManager() {
 
         /**
          * Checks to see if foreground application is Termux
-         * @return
          */
         protected boolean isCurrentAppTermux() {
             final ActivityManager activityManager = (ActivityManager) Objects.requireNonNull(getContext()).getSystemService(Context.ACTIVITY_SERVICE);
@@ -834,7 +829,6 @@ public void onResults(Bundle results) {
 
                 /**
                  * Get string description for error code
-                 * @param error
                  */
                 @Override
                 public void onError(int error) {
@@ -956,9 +950,6 @@ void initActivityDisplay(Activity activity) {
 
         /**
          * Places our generic widget view type inside a FrameLayout
-         * @param activity
-         * @param view
-         * @return
          */
         View getLayoutView(AppCompatActivity activity, T view) {
             FrameLayout layout = getFrameLayout(activity);
@@ -998,9 +989,6 @@ public void onDismiss(DialogInterface dialogInterface) {
 
         /**
          * Creates a dialog builder to initialize a dialog w/ a view and button click listeners
-         * @param activity
-         * @param clickListener
-         * @return
          */
         AlertDialog.Builder getDialogBuilder(AppCompatActivity activity, DialogInterface.OnClickListener clickListener) {
             final Intent intent = activity.getIntent();
@@ -1029,8 +1017,6 @@ void onDismissed() {
 
         /**
          * Create a basic frame layout that will add a margin around our main widget view
-         * @param activity
-         * @return
          */
         FrameLayout getFrameLayout(AppCompatActivity activity) {
             FrameLayout layout = new FrameLayout(activity);
@@ -1046,8 +1032,6 @@ FrameLayout getFrameLayout(AppCompatActivity activity) {
 
         /**
          * Returns an InputResult containing code of our button and the text if we hit OK
-         * @param button
-         * @return
          */
         InputResult onDialogClick(int button) {
             // receive indication of whether the OK or CANCEL button is clicked

diff --git a/app/src/main/java/com/termux/api/DownloadAPI.java b/app/src/main/java/com/termux/api/DownloadAPI.java
@@ -16,7 +16,7 @@ public class DownloadAPI {
     static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
         ResultReturner.returnData(apiReceiver, intent, new ResultWriter() {
             @Override
-            public void writeResult(PrintWriter out) throws Exception {
+            public void writeResult(PrintWriter out) {
                 final Uri downloadUri = intent.getData();
                 if (downloadUri == null) {
                     out.println("No download URI specified");

diff --git a/app/src/main/java/com/termux/api/FingerprintAPI.java b/app/src/main/java/com/termux/api/FingerprintAPI.java
@@ -66,8 +66,6 @@ public class FingerprintAPI {
 
     /**
      * Handles setup of fingerprint sensor and writes Fingerprint result to console
-     * @param context
-     * @param intent
      */
     static void onReceive(final Context context, final Intent intent) {
         resetFingerprintResult();
@@ -92,9 +90,6 @@ static void onReceive(final Context context, final Intent intent) {
 
     /**
      * Writes the result of our fingerprint result to the console
-     * @param context
-     * @param intent
-     * @param result
      */
     protected static void postFingerprintResult(Context context, Intent intent, final FingerprintResult result) {
         ResultReturner.returnData(context, intent, new ResultReturner.ResultJsonWriter() {
@@ -123,8 +118,6 @@ public void writeJson(JsonWriter out) throws Exception {
 
     /**
      * Ensure that we have a fingerprint sensor and that the user has already enrolled fingerprints
-     * @param fingerprintManager
-     * @return
      */
     @TargetApi(Build.VERSION_CODES.M)
     protected static boolean validateFingerprintSensor(Context context, FingerprintManager fingerprintManager) {
@@ -186,10 +179,6 @@ protected void handleFingerprint() {
 
         /**
          * Handles authentication callback from our fingerprint sensor
-         * @param context
-         * @param intent
-         * @param fingerprintManager
-         * @param cipher
          */
         protected static void authenticateWithFingerprint(final Context context, final Intent intent, final FingerprintManager fingerprintManager, Cipher cipher) {
             FingerprintManager.AuthenticationCallback authenticationCallback = new FingerprintManager.AuthenticationCallback() {
@@ -237,9 +226,6 @@ public void onAuthenticationHelp(int helpCode, CharSequence helpString) { }
         /**
          * Adds a timeout for our fingerprint sensor which will force a result return if we
          * haven't already received one
-         * @param context
-         * @param intent
-         * @param cancellationSignal
          */
         protected static void addSensorTimeout(final Context context, final Intent intent, final CancellationSignal cancellationSignal) {
             final Handler timeoutHandler = new Handler(Looper.getMainLooper());
@@ -255,10 +241,6 @@ public void run() {
             }, SENSOR_TIMEOUT);
         }
 
-        /**
-         * Generates our key
-         * @param keyStore
-         */
         protected static void generateKey(KeyStore keyStore) {
             try {
                 KeyGenerator keyGenerator = KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, KEYSTORE_NAME);
@@ -280,7 +262,6 @@ protected static void generateKey(KeyStore keyStore) {
 
         /**
          * Create the cipher needed for use with our SecretKey
-         * @return
          */
         protected static Cipher getCipher() {
             Cipher cipher = null;
@@ -313,15 +294,13 @@ protected static void addFailedAttempt() {
 
     /**
      * Add an error to our fingerprint result
-     * @param error
      */
     protected static void appendFingerprintError(String error) {
         fingerprintResult.errors.add(error);
     }
 
     /**
      * Set the final result of our authentication
-     * @param authResult
      */
     protected static void setAuthResult(String authResult) {
         fingerprintResult.authResult = authResult;

diff --git a/app/src/main/java/com/termux/api/MediaPlayerAPI.java b/app/src/main/java/com/termux/api/MediaPlayerAPI.java
@@ -22,8 +22,6 @@ public class MediaPlayerAPI {
 
     /**
      * Starts our PlayerService
-     * @param context
-     * @param intent
      */
     static void onReceive(final Context context, final Intent intent) {
         // Create intent for starting our player service and make sure
@@ -38,8 +36,6 @@ static void onReceive(final Context context, final Intent intent) {
     /**
      * Converts time in seconds to a formatted time string: HH:MM:SS
      * Hours will not be included if it is 0
-     * @param totalSeconds
-     * @return
      */
     public static String getTimeString(int totalSeconds) {
         int hours = (totalSeconds / 3600);
@@ -73,7 +69,6 @@ public static class PlayerService extends Service implements MediaPlayer.OnError
 
         /**
          * Returns our MediaPlayer instance and ensures it has all the necessary callbacks
-         * @return
          */
         protected MediaPlayer getMediaPlayer() {
             if (mediaPlayer == null) {
@@ -88,10 +83,6 @@ protected MediaPlayer getMediaPlayer() {
 
         /**
          * What we received from TermuxApiReceiver but now within this service
-         * @param intent
-         * @param flags
-         * @param startId
-         * @return
          */
         public int onStartCommand(Intent intent, int flags, int startId) {
             String command = intent.getAction();
@@ -166,16 +157,13 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
 
         /**
          * Returns result of executing a media command to termux
-         * @param context
-         * @param intent
-         * @param result
          */
         protected static void postMediaCommandResult(final Context context, final Intent intent,
                                                      final MediaCommandResult result) {
 
             ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
                 @Override
-                public void writeResult(PrintWriter out) throws Exception {
+                public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
                     if (result.error != null) {
                         out.append(result.error + "\n");
@@ -263,8 +251,6 @@ public MediaCommandResult handle(MediaPlayer player, Context context, Intent int
 
         /**
          * Creates string showing current position in active track
-         * @param player
-         * @return
          */
         protected static String getPlaybackPositionString(MediaPlayer player) {
             int duration = player.getDuration() / 1000;

diff --git a/app/src/main/java/com/termux/api/MicRecorderAPI.java b/app/src/main/java/com/termux/api/MicRecorderAPI.java
@@ -30,8 +30,6 @@ public class MicRecorderAPI {
 
     /**
      * Starts our MicRecorder service
-     * @param context
-     * @param intent
      */
     static void onReceive(final Context context, final Intent intent) {
         Intent recorderService = new Intent(context, MicRecorderService.class);
@@ -109,7 +107,6 @@ public void writeResult(PrintWriter out) {
 
         /**
          * Returns our MediaPlayer instance and ensures it has all the necessary callbacks
-         * @return
          */
         protected MediaRecorder getMediaRecorder() {
             if (mediaRecorder == null) {

diff --git a/app/src/main/java/com/termux/api/NotificationAPI.java b/app/src/main/java/com/termux/api/NotificationAPI.java
@@ -180,7 +180,7 @@ static void onReceiveShowNotification(TermuxApiReceiver apiReceiver, final Conte
 
         ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
             @Override
-            public void writeResult(PrintWriter out) throws Exception {
+            public void writeResult(PrintWriter out) {
                 NotificationManager manager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 
                 if (!TextUtils.isEmpty(inputString)) {
@@ -224,7 +224,6 @@ static PendingIntent createAction(final Context context, String action){
         executeIntent.setClassName("com.termux", TERMUX_SERVICE);
         executeIntent.putExtra(EXTRA_EXECUTE_IN_BACKGROUND, true);
         executeIntent.putExtra(EXTRA_ARGUMENTS, arguments);
-        PendingIntent pi = PendingIntent.getService(context, 0, executeIntent, 0);
-        return pi;
+        return PendingIntent.getService(context, 0, executeIntent, 0);
     }
 }
diff --git a/app/src/main/java/com/termux/api/NotificationService.java b/app/src/main/java/com/termux/api/NotificationService.java
@@ -6,8 +6,7 @@ public class NotificationService extends NotificationListenerService {
     static NotificationService _this;
 
     public static NotificationService get() {
-        NotificationService ret = _this;
-        return ret;
+        return _this;
     }
 
     @Override

diff --git a/app/src/main/java/com/termux/api/PhotoAPI.java b/app/src/main/java/com/termux/api/PhotoAPI.java
@@ -43,7 +43,7 @@ static void onReceive(TermuxApiReceiver apiReceiver, final Context context, Inte
 
         ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
             @Override
-            public void writeResult(PrintWriter stdout) throws Exception {
+            public void writeResult(PrintWriter stdout) {
                 if (!(outputDir.isDirectory() || outputDir.mkdirs())) {
                     stdout.println("Not a folder (and unable to create it): " + outputDir.getAbsolutePath());
                 } else {

diff --git a/app/src/main/java/com/termux/api/SensorAPI.java b/app/src/main/java/com/termux/api/SensorAPI.java
@@ -31,8 +31,6 @@ public class SensorAPI {
 
     /**
      * Starts our SensorReader service
-     * @param context
-     * @param intent
      */
     public static void onReceive(final Context context, final Intent intent) {
         Intent serviceIntent = new Intent(context, SensorReaderService.class);
@@ -165,7 +163,7 @@ private void postSensorCommandResult(final Context context, final Intent intent,
 
             ResultReturner.returnData(context, intent, new ResultReturner.ResultWriter() {
                 @Override
-                public void writeResult(PrintWriter out) throws Exception {
+                public void writeResult(PrintWriter out) {
                     out.append(result.message + "\n");
                     if (result.error != null) {
                         out.append(result.error + "\n");
@@ -260,8 +258,6 @@ public SensorCommandResult handle(SensorManager sensorManager, Context context,
 
         /**
          * Gets a string array of all user requested sensor names to listen to
-         * @param intent
-         * @return
          */
         protected static String[] getUserRequestedSensors(Intent intent) {
             // sensor values passed to us from user
@@ -271,9 +267,6 @@ protected static String[] getUserRequestedSensors(Intent intent) {
 
         /**
          * Gets a list of all sensors to listen to, that were requested and are available
-         * @param sensorManager
-         * @param requestedSensors
-         * @return
          */
         protected static List<Sensor> getSensorsToListenTo(SensorManager sensorManager, String[] requestedSensors, Intent intent) {
             List<Sensor> availableSensors = sensorManager.getSensorList(Sensor.TYPE_ALL);
@@ -320,8 +313,6 @@ protected static void clearSensorValues() {
 
         /**
          * Creates SensorOutputWriter to write sensor values to stdout
-         * @param intent
-         * @return
          */
         protected static SensorOutputWriter createSensorOutputWriter(Intent intent) {
             String socketAddress = intent.getStringExtra("socket_output");

diff --git a/app/src/main/java/com/termux/api/ShareAPI.java b/app/src/main/java/com/termux/api/ShareAPI.java
@@ -52,7 +52,7 @@ static void onReceive(TermuxApiReceiver apiReceiver, final Context context, fina
             // Read text to share from stdin.
             ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
                 @Override
-                public void writeResult(PrintWriter out) throws Exception {
+                public void writeResult(PrintWriter out) {
                     if (TextUtils.isEmpty(inputString)) {
                         out.println("Error: Nothing to share");
                         return;
@@ -74,7 +74,7 @@ public void writeResult(PrintWriter out) throws Exception {
             // Share specified file.
             ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
                 @Override
-                public void writeResult(PrintWriter out) throws Exception {
+                public void writeResult(PrintWriter out) {
                     final File fileToShare = new File(fileExtra);
                     if (!(fileToShare.isFile() && fileToShare.canRead())) {
                         out.println("ERROR: Not a readable file: '" + fileToShare.getAbsolutePath() + "'");

diff --git a/app/src/main/java/com/termux/api/SmsSendAPI.java b/app/src/main/java/com/termux/api/SmsSendAPI.java
@@ -14,7 +14,7 @@ public class SmsSendAPI {
     static void onReceive(TermuxApiReceiver apiReceiver, final Intent intent) {
         ResultReturner.returnData(apiReceiver, intent, new ResultReturner.WithStringInput() {
             @Override
-            public void writeResult(PrintWriter out) throws Exception {
+            public void writeResult(PrintWriter out) {
                 final SmsManager smsManager = SmsManager.getDefault();
                 String[] recipients = intent.getStringArrayExtra("recipients");
 

diff --git a/app/src/main/java/com/termux/api/StorageGetAPI.java b/app/src/main/java/com/termux/api/StorageGetAPI.java
@@ -22,7 +22,7 @@ public class StorageGetAPI {
     static void onReceive(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
         ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultWriter() {
             @Override
-            public void writeResult(PrintWriter out) throws Exception {
+            public void writeResult(PrintWriter out) {
                 final String fileExtra = intent.getStringExtra("file");
                 if (fileExtra == null || !new File(fileExtra).getParentFile().canWrite()) {
                     out.println("ERROR: Not a writable folder: " + fileExtra);

diff --git a/app/src/main/java/com/termux/api/TelephonyAPI.java b/app/src/main/java/com/termux/api/TelephonyAPI.java
@@ -1,5 +1,6 @@
 package com.termux.api;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -110,6 +111,7 @@ public void writeJson(JsonWriter out) throws Exception {
 
     static void onReceiveTelephonyDeviceInfo(TermuxApiReceiver apiReceiver, final Context context, final Intent intent) {
         ResultReturner.returnData(apiReceiver, intent, new ResultReturner.ResultJsonWriter() {
+            @SuppressLint("HardwareIds")
             @Override
             public void writeJson(JsonWriter out) throws Exception {
                 TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

diff --git a/app/src/main/java/com/termux/api/TextToSpeechAPI.java b/app/src/main/java/com/termux/api/TextToSpeechAPI.java
@@ -94,7 +94,7 @@ public void onInit(int status) {
 
             ResultReturner.returnData(this, intent, new ResultReturner.WithInput() {
                 @Override
-                public void writeResult(PrintWriter out) throws Exception {
+                public void writeResult(PrintWriter out) {
 
                     try {
                         try {