Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58a02575 authored by Mark Harman's avatar Mark Harman
Browse files

Android warnings.

parent 9e78b30e

app/src/androidTest/java/net/sourceforge/opencamera/test/MainActivityTest.java

+1 −2
Original line number Diff line number Diff line
@@ -2453,8 +2453,7 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv 
            int [] test_isos = {0, 50, 100, 200, 400, 800, 1600, 3200, 6400, 10000};

            int min_iso = mPreview.getMinimumISO();

            int max_iso = mPreview.getMaximumISO();

            for(int i=0;i<test_isos.length;i++) {

                int test_iso = test_isos[i];

            for(int test_iso : test_isos) {

                subTestPopupButtonAvailability("TEST_ISO", "" + test_iso, test_iso >= min_iso && test_iso <= max_iso);

            }

            subTestPopupButtonAvailability("TEST_ISO", "" + (min_iso-1), false);

app/src/main/java/net/sourceforge/opencamera/MagneticSensor.java

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import android.util.Log; 


/** Handles magnetic sensor.

 */

public class MagneticSensor {

class MagneticSensor {

    private static final String TAG = "MagneticSensor";



    private final MainActivity main_activity;

app/src/main/java/net/sourceforge/opencamera/MyApplicationInterface.java

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.graphics.Rect; 
import android.location.Address;

import android.location.Geocoder;

import android.location.Location;

import android.media.CamcorderProfile;

import android.media.MediaMetadataRetriever;

import android.media.MediaPlayer;

import android.media.MediaRecorder;

app/src/main/java/net/sourceforge/opencamera/MyPreferenceFragment.java

+3 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ import android.content.ClipData; 
import android.content.ClipboardManager;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

//import android.content.Intent;

import android.content.SharedPreferences;

import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

import android.content.pm.PackageInfo;
@@ -21,7 +21,7 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.res.TypedArray;

import android.graphics.Color;

import android.graphics.Point;

import android.net.Uri;

//import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.preference.EditTextPreference;
@@ -34,9 +34,8 @@ import android.preference.PreferenceGroup; 
import android.preference.PreferenceManager;

import android.preference.TwoStatePreference;

import android.text.SpannableString;

import android.text.Spanned;

//import android.text.Spanned;

import android.text.method.LinkMovementMethod;

import android.text.style.URLSpan;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.Display;

app/src/main/java/net/sourceforge/opencamera/remotecontrol/KrakenGattAttributes.java

+8 −9
Original line number Diff line number Diff line
@@ -9,16 +9,15 @@ import java.util.UUID; 
 * an underwater camera housing that communicates its key presses with the phone over

 * Bluetooth Low Energy

 */

public class KrakenGattAttributes {

    public static final UUID CLIENT_CHARACTERISTIC_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");



    //public static final UUID KRAKEN_SENSORS_SERVICE = UUID.fromString("00001623-1212-efde-1523-785feabcd123");

    public static final UUID KRAKEN_SENSORS_CHARACTERISTIC = UUID.fromString("00001625-1212-efde-1523-785feabcd123");

    //public static final UUID KRAKEN_BUTTONS_SERVICE= UUID.fromString("00001523-1212-efde-1523-785feabcd123");

    public static final UUID KRAKEN_BUTTONS_CHARACTERISTIC= UUID.fromString("00001524-1212-efde-1523-785feabcd123");

    // public static final UUID BATTERY_SERVICE = UUID.fromString("180f");

    // public static final UUID BATTERY_LEVEL = UUID.fromString("2a19");

class KrakenGattAttributes {

    static final UUID CLIENT_CHARACTERISTIC_CONFIG = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");



    //static final UUID KRAKEN_SENSORS_SERVICE = UUID.fromString("00001623-1212-efde-1523-785feabcd123");

    static final UUID KRAKEN_SENSORS_CHARACTERISTIC = UUID.fromString("00001625-1212-efde-1523-785feabcd123");

    //static final UUID KRAKEN_BUTTONS_SERVICE= UUID.fromString("00001523-1212-efde-1523-785feabcd123");

    static final UUID KRAKEN_BUTTONS_CHARACTERISTIC= UUID.fromString("00001524-1212-efde-1523-785feabcd123");

    //static final UUID BATTERY_SERVICE = UUID.fromString("180f");

    //static final UUID BATTERY_LEVEL = UUID.fromString("2a19");



    static List<UUID> getDesiredCharacteristics() {

        return Arrays.asList(KRAKEN_BUTTONS_CHARACTERISTIC, KRAKEN_SENSORS_CHARACTERISTIC);