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

Commit 7c6c766f authored by Mark Harman's avatar Mark Harman
Browse files

Fix Android warnings.

parent e34d9727

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

+0 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ import net.sourceforge.opencamera.cameracontroller.RawImage; 
import java.io.ByteArrayInputStream;

import java.io.File;

import java.io.FileDescriptor;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.FileOutputStream;

import java.io.IOException;
@@ -30,7 +29,6 @@ import android.annotation.TargetApi; 
import android.app.Activity;

import android.app.ActivityManager;

import android.content.ContentValues;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

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

+4 −3
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ public class MainActivity extends Activity { 
            return (res ? 1249 : 1259) ^ (alt == null ? 0 : alt.hashCode());

        }



        @NonNull

        @Override

        public String toString() {

            return "CheckSaveLocationResult{" + res + " , " + alt + "}";
@@ -1502,7 +1503,7 @@ public class MainActivity extends Activity { 
    }



    @Override

    public void onConfigurationChanged(Configuration newConfig) {

    public void onConfigurationChanged(@NonNull Configuration newConfig) {

        if( MyDebug.LOG )

            Log.d(TAG, "onConfigurationChanged()");

        // configuration change can include screen orientation (landscape/portrait) when not locked (when settings is open)
@@ -3941,7 +3942,7 @@ public class MainActivity extends Activity { 
        editText.setText(sharedPreferences.getString(PreferenceKeys.SaveLocationPreferenceKey, "OpenCamera"));

        InputFilter filter = new InputFilter() {

            // whilst Android seems to allow any characters on internal memory, SD cards are typically formatted with FAT32

            String disallowed = "|\\?*<\":>";

            final String disallowed = "|\\?*<\":>";

            public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {

                for(int i=start;i<end;i++) {

                    if( disallowed.indexOf( source.charAt(i) ) != -1 ) {
@@ -4318,7 +4319,7 @@ public class MainActivity extends Activity { 
    }



    @Override

    protected void onSaveInstanceState(Bundle state) {

    protected void onSaveInstanceState(@NonNull Bundle state) {

        if( MyDebug.LOG )

            Log.d(TAG, "onSaveInstanceState");

        super.onSaveInstanceState(state);

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

+1 −1
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ public class StorageUtils { 


        Media media = null;



        Uri baseUri = null;

        Uri baseUri;

        try {

            String parentDocUri = DocumentsContract.getTreeDocumentId(treeUri);

            baseUri = DocumentsContract.buildChildDocumentsUriUsingTree(treeUri, parentDocUri);

app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController.java

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ import android.util.Log; 
import android.view.SurfaceHolder;

import android.view.TextureView;



import androidx.annotation.NonNull;



/** CameraController is an abstract class that wraps up the access/control to

 *  the Android camera, so that the rest of the application doesn't have to

 *  deal directly with the Android camera API. It also allows us to support
@@ -203,6 +205,7 @@ public abstract class CameraController { 
            return width*41 + height;

        }



        @NonNull

        public String toString() {

            StringBuilder s = new StringBuilder();

            for (int[] f : this.fps_ranges) {

app/src/main/java/net/sourceforge/opencamera/preview/VideoProfile.java

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ import android.media.CamcorderProfile; 
import android.media.MediaRecorder;

import android.util.Log;



import androidx.annotation.NonNull;



import net.sourceforge.opencamera.MyDebug;



/** This is essentially similar to CamcorderProfile in that it encapsulates a set of video settings
@@ -54,6 +56,7 @@ public class VideoProfile { 
        this.videoFrameWidth = camcorderProfile.videoFrameWidth;

    }



    @NonNull

    public String toString() {

        return ("\nAudioSource:        " + this.audioSource +

                "\nVideoSource:        " + this.videoSource +