JamesDSPManager: Code cleanup.

Signed-off-by: Christos Papageorgiou <root.expert.xda@gmail.com>
Change-Id: I53e9b16a4705a0e96a69799e4a3745842af11ab9

11 files changed, 48 insertions, 181 deletions

diff --git a/app/src/main/java/james/dsp/activity/DSPManager.java b/app/src/main/java/james/dsp/activity/DSPManager.java
index c908d50..3fe8feb 100644
--- a/app/src/main/java/james/dsp/activity/DSPManager.java
+++ b/app/src/main/java/james/dsp/activity/DSPManager.java
@@ -16,7 +16,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
@@ -42,17 +41,13 @@ import james.dsp.R;
 import james.dsp.service.HeadsetService;
 import james.dsp.widgets.CustomDrawerLayout;
 
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -100,11 +95,6 @@ public final class DSPManager extends Activity
     private boolean mFromSavedInstanceState;
     private boolean mUserLearnedDrawer;
 
-    //==================================
-    // ViewPager
-    //==================================
-    protected MyAdapter pagerAdapter;
-    protected ViewPager viewPager;
 
     //==================================
     // Fields
@@ -154,10 +144,14 @@ public final class DSPManager extends Activity
         effectMode = preferencesMode.getInt("dsp.app.modeEffect", 0);
         mUserLearnedDrawer = preferencesMode.getBoolean(PREF_USER_LEARNED_DRAWER, false);
         mTitle = getTitle();
+
         ActionBar mActionBar = getActionBar();
-        mActionBar.setDisplayHomeAsUpEnabled(true);
-        mActionBar.setHomeButtonEnabled(true);
-        mActionBar.setDisplayShowTitleEnabled(true);
+        if (mActionBar != null) {
+            mActionBar.setDisplayHomeAsUpEnabled(true);
+            mActionBar.setHomeButtonEnabled(true);
+            mActionBar.setDisplayShowTitleEnabled(true);
+        }
+
         if (savedInstanceState != null)
         {
             mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
@@ -168,7 +162,8 @@ public final class DSPManager extends Activity
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             initializeNotificationChannel();
             startForegroundService(serviceIntent);
-        } else startService(serviceIntent);
+        } else
+            startService(serviceIntent);
 
         sendBroadcast(new Intent(DSPManager.ACTION_UPDATE_PREFERENCES));
         setUpUi();
@@ -291,7 +286,7 @@ public final class DSPManager extends Activity
         mTitles = getTitles();
         mEntries = getEntries();
         setContentView(R.layout.activity_main);
-        mDrawerListView = (ListView)findViewById(R.id.dsp_navigation_drawer);
+        mDrawerListView = findViewById(R.id.dsp_navigation_drawer);
         mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener()
         {
             @Override
@@ -574,19 +569,19 @@ public final class DSPManager extends Activity
     */
     private List<HashMap<String, String>> getTitles()
     {
-        ArrayList<HashMap<String, String>> tmpList = new ArrayList<HashMap<String, String>>();
+        ArrayList<HashMap<String, String>> tmpList = new ArrayList<>();
         // Headset
-        HashMap<String, String> mTitleMap = new HashMap<String, String>();
+        HashMap<String, String> mTitleMap = new HashMap<>();
         mTitleMap.put("ICON", R.drawable.empty_icon + "");
         mTitleMap.put("TITLE", getString(R.string.headset_title));
         tmpList.add(mTitleMap);
         // Speaker
-        mTitleMap = new HashMap<String, String>();
+        mTitleMap = new HashMap<>();
         mTitleMap.put("ICON", R.drawable.empty_icon + "");
         mTitleMap.put("TITLE", getString(R.string.speaker_title));
         tmpList.add(mTitleMap);
         // Bluetooth
-        mTitleMap = new HashMap<String, String>();
+        mTitleMap = new HashMap<>();
         mTitleMap.put("ICON", R.drawable.empty_icon + "");
         mTitleMap.put("TITLE", getString(R.string.bluetooth_title));
         tmpList.add(mTitleMap);
@@ -598,11 +593,11 @@ public final class DSPManager extends Activity
     */
     private String[] getEntries()
     {
-        ArrayList<String> entryString = new ArrayList<String>();
+        ArrayList<String> entryString = new ArrayList<>();
         entryString.add("headset");
         entryString.add("speaker");
         entryString.add("bluetooth");
-        return entryString.toArray(new String[entryString.size()]);
+        return entryString.toArray(new String[0]);
     }
 
     //==================================
@@ -634,107 +629,17 @@ public final class DSPManager extends Activity
         }
     }
 
-    public class MyAdapter extends FragmentPagerAdapter
-    {
-        private final String[] entries;
-        private final List<HashMap<String, String>> titles;
-
-        public MyAdapter(FragmentManager fm)
-        {
-            super(fm);
-            entries = DSPManager.mEntries;
-            titles = DSPManager.mTitles;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position)
-        {
-            return titles.get(position).get("TITLE");
-        }
-
-        public String[] getEntries()
-        {
-            return entries;
-        }
-
-        @Override
-        public int getCount()
-        {
-            return entries.length;
-        }
-
-        @Override
-        public Fragment getItem(int position)
-        {
-            final DSPScreen dspFragment = new DSPScreen();
-            Bundle b = new Bundle();
-            b.putString("config", entries[position]);
-            dspFragment.setArguments(b);
-            return dspFragment;
-        }
-    }
-
     public static class HelpFragment extends DialogFragment
     {
         @Override
         public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle state)
         {
             View v = inflater.inflate(R.layout.help, null);
-            TextView tv = (TextView)v.findViewById(R.id.help);
+            TextView tv = v.findViewById(R.id.help);
             tv.setText(R.string.help_text);
             return v;
         }
     }
-    private String readFromFile(Context context, String path) {
-
-        String ret = "";
-
-        try {
-            InputStream inputStream = context.openFileInput(path);
-
-            if ( inputStream != null ) {
-                InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
-                BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-                String receiveString = "";
-                StringBuilder stringBuilder = new StringBuilder();
-
-                while ( (receiveString = bufferedReader.readLine()) != null ) {
-                    stringBuilder.append(receiveString);
-                }
-
-                inputStream.close();
-                ret = stringBuilder.toString();
-            }
-        }
-        catch (FileNotFoundException e) {
-            Log.e("login activity", "File not found: " + e.toString());
-        } catch (IOException e) {
-            Log.e("login activity", "Can not read file: " + e.toString());
-        }
-
-        return ret;
-    }
-    public void writeToFile(String data)
-    {
-    	File path = new File(benchmarkPath);
-        if(!path.exists())
-            path.mkdirs();
-        final File file = new File(path, wisdomTxt);
-        try
-        {
-            file.createNewFile();
-            FileOutputStream fOut = new FileOutputStream(file);
-            OutputStreamWriter myOutWriter = new OutputStreamWriter(fOut);
-            myOutWriter.append(data);
-            myOutWriter.close();
-            fOut.flush();
-            fOut.close();
-        }
-        catch (IOException e)
-        {
-            Log.e("Exception", "File write failed: " + e.toString());
-        } 
-    }
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private void initializeNotificationChannel() {
diff --git a/app/src/main/java/james/dsp/activity/DSPScreen.java b/app/src/main/java/james/dsp/activity/DSPScreen.java
index c401645..5f91c92 100644
--- a/app/src/main/java/james/dsp/activity/DSPScreen.java
+++ b/app/src/main/java/james/dsp/activity/DSPScreen.java
@@ -25,8 +25,6 @@ import james.dsp.service.HeadsetService;
  */
 public final class DSPScreen extends PreferenceFragment
 {
-    protected static final String TAG = DSPScreen.class.getSimpleName();
-
     private final OnSharedPreferenceChangeListener listener = new OnSharedPreferenceChangeListener()
     {
         @Override
diff --git a/app/src/main/java/james/dsp/activity/JdspImpResToolbox.java b/app/src/main/java/james/dsp/activity/JdspImpResToolbox.java
index 1b99873..f3eea39 100644
--- a/app/src/main/java/james/dsp/activity/JdspImpResToolbox.java
+++ b/app/src/main/java/james/dsp/activity/JdspImpResToolbox.java
@@ -18,5 +18,4 @@ public class JdspImpResToolbox
     public static native float[] ReadImpulseResponseToFloat(int targetSampleRate);
     public static native String OfflineAudioResample(String path, String filename, int targetSampleRate);
     public static native int FFTConvolutionBenchmark(int entriesGen, int fs, double c0[], double c1[]);
-    //public static native String FFTConvolutionBenchmarkToString(int entriesGen, int fs);
 }
diff --git a/app/src/main/java/james/dsp/preference/EqualizerPreference.java b/app/src/main/java/james/dsp/preference/EqualizerPreference.java
index d4c6b71..5d117c8 100644
--- a/app/src/main/java/james/dsp/preference/EqualizerPreference.java
+++ b/app/src/main/java/james/dsp/preference/EqualizerPreference.java
@@ -18,9 +18,7 @@ import java.util.Locale;
 
 public class EqualizerPreference extends DialogPreference
 {
-    protected static final String TAG = EqualizerPreference.class.getSimpleName();
-
-    protected EqualizerSurface mListEqualizer, mDialogEqualizer;
+    private EqualizerSurface mListEqualizer, mDialogEqualizer;
 
     private HeadsetService mHeadsetService;
 
@@ -46,7 +44,7 @@ public class EqualizerPreference extends DialogPreference
         setDialogLayoutResource(R.layout.equalizer_popup);
     }
 
-    protected void updateDspFromDialogEqualizer()
+    private void updateDspFromDialogEqualizer()
     {
         if (mHeadsetService != null)
         {
@@ -72,7 +70,7 @@ public class EqualizerPreference extends DialogPreference
     protected void onBindDialogView(View view)
     {
         super.onBindDialogView(view);
-        mDialogEqualizer = (EqualizerSurface) view.findViewById(R.id.FrequencyResponse);
+        mDialogEqualizer = view.findViewById(R.id.FrequencyResponse);
         mDialogEqualizer.setOnTouchListener(new OnTouchListener()
         {
             @Override
@@ -106,10 +104,10 @@ public class EqualizerPreference extends DialogPreference
     {
         if (positiveResult)
         {
-            String value = "";
+            StringBuilder value = new StringBuilder();
             for (int i = 0; i < 15; i++)
-                value += String.format(Locale.ROOT, "%.7f", mDialogEqualizer.getBand(i)) + ";";
-            persistString(value);
+                value.append(String.format(Locale.ROOT, "%.7f", mDialogEqualizer.getBand(i))).append(";");
+            persistString(value.toString());
             updateListEqualizerFromValue();
         }
         if (mHeadsetService != null)
@@ -121,7 +119,7 @@ public class EqualizerPreference extends DialogPreference
     protected void onBindView(View view)
     {
         super.onBindView(view);
-        mListEqualizer = (EqualizerSurface) view.findViewById(R.id.FrequencyResponse);
+        mListEqualizer = view.findViewById(R.id.FrequencyResponse);
         updateListEqualizerFromValue();
     }
 
diff --git a/app/src/main/java/james/dsp/preference/EqualizerSurface.java b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
index 4c41fc8..a5328a6 100644
--- a/app/src/main/java/james/dsp/preference/EqualizerSurface.java
+++ b/app/src/main/java/james/dsp/preference/EqualizerSurface.java
@@ -16,7 +16,6 @@ import android.view.View;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import james.dsp.R;
-import james.dsp.activity.DSPManager;
 
 public class EqualizerSurface extends SurfaceView
 {
diff --git a/app/src/main/java/james/dsp/preference/SeekBarPreference.java b/app/src/main/java/james/dsp/preference/SeekBarPreference.java
index b322be4..738c6b6 100644
--- a/app/src/main/java/james/dsp/preference/SeekBarPreference.java
+++ b/app/src/main/java/james/dsp/preference/SeekBarPreference.java
@@ -94,15 +94,13 @@ public class SeekBarPreference extends Preference implements OnSeekBarChangeList
     @Override
     protected View onCreateView(ViewGroup parent)
     {
+        super.onCreateView(parent);
         RelativeLayout layout = null;
-        try
-        {
+        try {
             LayoutInflater mInflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             layout = (RelativeLayout) mInflater.inflate(R.layout.seek_bar_preference, parent, false);
-            mTitle = (TextView) layout.findViewById(android.R.id.title);
-        }
-        catch (Exception e)
-        {
+            mTitle = layout.findViewById(android.R.id.title);
+        } catch (Exception e) {
         }
         return layout;
     }
@@ -115,7 +113,7 @@ public class SeekBarPreference extends Preference implements OnSeekBarChangeList
         {
             // move our seekbar to the new view we've been given
             ViewParent oldContainer = mSeekBar.getParent();
-            ViewGroup newContainer = (ViewGroup) view.findViewById(R.id.seekBarPrefBarContainer);
+            ViewGroup newContainer = view.findViewById(R.id.seekBarPrefBarContainer);
             if (oldContainer != newContainer)
             {
                 // remove the seekbar from the old view
@@ -137,18 +135,18 @@ public class SeekBarPreference extends Preference implements OnSeekBarChangeList
      *
      * @param view
      */
-    protected void updateView(View view)
+    private void updateView(View view)
     {
         try
         {
             RelativeLayout layout = (RelativeLayout) view;
-            mStatusText = (TextView) layout.findViewById(R.id.seekBarPrefValue);
+            mStatusText = layout.findViewById(R.id.seekBarPrefValue);
             mStatusText.setText(String.valueOf(mCurrentValue));
             mStatusText.setMinimumWidth(30);
             mSeekBar.setProgress(mCurrentValue - mMinValue);
-            TextView unitsRight = (TextView) layout.findViewById(R.id.seekBarPrefUnitsRight);
+            TextView unitsRight = layout.findViewById(R.id.seekBarPrefUnitsRight);
             unitsRight.setText(mUnitsRight);
-            TextView unitsLeft = (TextView) layout.findViewById(R.id.seekBarPrefUnitsLeft);
+            TextView unitsLeft = layout.findViewById(R.id.seekBarPrefUnitsLeft);
             unitsLeft.setText(mUnitsLeft);
         }
         catch (Exception e)
diff --git a/app/src/main/java/james/dsp/preference/SummariedListPreferenceDDC.java b/app/src/main/java/james/dsp/preference/SummariedListPreferenceDDC.java
index e8d0a89..d30f7d9 100644
--- a/app/src/main/java/james/dsp/preference/SummariedListPreferenceDDC.java
+++ b/app/src/main/java/james/dsp/preference/SummariedListPreferenceDDC.java
@@ -24,7 +24,7 @@ public class SummariedListPreferenceDDC extends ListPreference
     }
 
     // Read file list from path
-    public static void getFileNameList(File path, String fileExt, ArrayList<String> fileList)
+    private static void getFileNameList(File path, String fileExt, ArrayList<String> fileList)
     {
         if (path.isDirectory())
         {
@@ -138,9 +138,4 @@ public class SummariedListPreferenceDDC extends ListPreference
             setSummary("");
         }
     }
-
-    public void refreshFromPreference()
-    {
-        onSetInitialValue(true, null);
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/james/dsp/preference/SummariedListPreferenceWithCustom.java b/app/src/main/java/james/dsp/preference/SummariedListPreferenceWithCustom.java
index 956bf5a..aa33531 100644
--- a/app/src/main/java/james/dsp/preference/SummariedListPreferenceWithCustom.java
+++ b/app/src/main/java/james/dsp/preference/SummariedListPreferenceWithCustom.java
@@ -28,7 +28,7 @@ public class SummariedListPreferenceWithCustom extends ListPreference
     }
 
     // Read file list from path
-    public static void getFileNameList(File path, String fileExt, ArrayList<String> fileList)
+    private static void getFileNameList(File path, String fileExt, ArrayList<String> fileList)
     {
         if (path.isDirectory())
         {
@@ -68,7 +68,7 @@ public class SummariedListPreferenceWithCustom extends ListPreference
                 kernelFile.mkdirs();
                 kernelFile.mkdir();
             }
-            ArrayList<String> kernelList = new ArrayList<String>();
+            ArrayList<String> kernelList = new ArrayList<>();
             getFileNameList(kernelFile, ".irs", kernelList);
             getFileNameList(kernelFile, ".wav", kernelList);
             getFileNameList(kernelFile, ".flac", kernelList);
@@ -164,21 +164,18 @@ public class SummariedListPreferenceWithCustom extends ListPreference
             setSummary("");
         }
     }
-
-    public void refreshFromPreference()
-    {
-        onSetInitialValue(true, null);
-    }
 }
+
 class ResamplerThread implements Runnable {
-	String path;
-	String filename;
-	int tarSmpRate;
+	private String path;
+	private String filename;
+	private int tarSmpRate;
 	   ResamplerThread(String p, String f, int s) {
 	       path = p;
 	       filename = f;
 	       tarSmpRate = s;
 	   }
+
 	   public void run() {
            final String finalName = JdspImpResToolbox.OfflineAudioResample(path, filename, tarSmpRate);
            new Handler(Looper.getMainLooper()).post(new Runnable() {
diff --git a/app/src/main/java/james/dsp/preference/SummariedTextPreferenceRanged.java b/app/src/main/java/james/dsp/preference/SummariedTextPreferenceRanged.java
index ee436df..7f5ec3c 100644
--- a/app/src/main/java/james/dsp/preference/SummariedTextPreferenceRanged.java
+++ b/app/src/main/java/james/dsp/preference/SummariedTextPreferenceRanged.java
@@ -112,9 +112,4 @@ public class SummariedTextPreferenceRanged extends EditTextPreference
     	}
         super.setText(value);
     }
-
-    public void refreshFromPreference()
-    {
-        onSetInitialValue(true, null);
-    }
 }
diff --git a/app/src/main/java/james/dsp/service/HeadsetService.java b/app/src/main/java/james/dsp/service/HeadsetService.java
index f8e7439..9a4ee95 100644
--- a/app/src/main/java/james/dsp/service/HeadsetService.java
+++ b/app/src/main/java/james/dsp/service/HeadsetService.java
@@ -10,8 +10,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.media.AudioManager;
 import android.media.audiofx.AudioEffect;
 import android.os.Binder;
@@ -31,7 +29,6 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -63,8 +60,8 @@ public class HeadsetService extends Service
 	public final static UUID EFFECT_JAMESDSP = UUID.fromString("f27317f4-c984-4de6-9a90-545759495bf2");
 	public class JDSPModule
 	{
-		public AudioEffect JamesDSP;
-		public JDSPModule(int sessionId)
+		AudioEffect JamesDSP;
+		JDSPModule(int sessionId)
 		{
 			try
 			{
@@ -94,19 +91,11 @@ public class HeadsetService extends Service
 			}
 		}
 
-		public void release()
+		void release()
 		{
 			JamesDSP.release();
 		}
 
-		/**
-		* Proxies call to AudioEffect.setParameter(byte[], byte[]) which is
-		* available via reflection.
-		*
-		* @param audioEffect
-		* @param parameter
-		* @param value
-		*/
 		private byte[] IntToByte(int[] input)
 		{
 			int int_index, byte_index;
@@ -132,7 +121,7 @@ public class HeadsetService extends Service
 			value |= (encodedValue[0] & 0xFF);
 			return value;
 		}
-		private void setParameterIntArray(AudioEffect audioEffect, int parameter, int value[])
+		private void setParameterIntArray(AudioEffect audioEffect, int parameter, int[] value)
 		{
 			try
 			{
@@ -593,6 +582,7 @@ class StartUpOptimiserThread implements Runnable {
 	*
 	* @param levels
 	*/
+
 	public void setEqualizerLevels(float[] levels)
 	{
 		mOverriddenEqualizerLevels = levels;
@@ -727,8 +717,7 @@ class StartUpOptimiserThread implements Runnable {
 				/* Equalizer state is in a single string preference with all values separated by ; */
 				if (mOverriddenEqualizerLevels != null)
 				{
-					for (short i = 0; i < mOverriddenEqualizerLevels.length; i++)
-						eqLevels[i] = mOverriddenEqualizerLevels[i];
+                    System.arraycopy(mOverriddenEqualizerLevels, 0, eqLevels, 0, mOverriddenEqualizerLevels.length);
 				}
 				else
 				{
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fb071bf..767847f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">James DSP</string>
+  <string name="app_name" translatable="false">James DSP</string>
   <string name="headset_title">Headset</string>
   <string name="speaker_title">Speaker</string>
   <string name="notification_channel_name">@string/app_name</string>
@@ -110,13 +110,7 @@
   <string name="displaydevmsg">%1$s module info</string>
   <string name="removetext">Remove</string>
   <string name="displaytext">Display</string>
-  <string name="theme">Current theme:%1$s</string>
   <string name="globaleffect_title">Reg:%1$s</string>
-  <string name="darktheme">Dark</string>
-  <string name="lighttheme">Light</string>
-  <string name="defaulttheme">Default</string>
-  <string name="redtheme">R/G Complementary</string>
-  <string name="ideatheme">Idea</string>
   <string name="globalreg">Global(Require Direct volume disabled)</string>
   <string name="traditionalreg">Conventional</string>
   <!-- Drawer -->