fixed the time in state reset bug

AndroidManifest.xml

@@ -7,12 +7,13 @@
 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
     <uses-permission android:name="android.permission.BATTERY_STATS" />
+    <uses-permission android:name="android.permission.DUMP" />
 
     <application
         android:allowBackup="true"
@@ -47,6 +48,19 @@
                 <category android:name="android.intent.category.HOME" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name="com.phantomLord.cpufrequtils.app.receivers.SaveReferenceReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+            </intent-filter>
+        </receiver>
+
+        <service android:name="com.phantomLord.cpufrequtils.app.services.BootService" >
+        </service>
+        <service android:name="com.phantomLord.cpufrequtils.app.services.SaveSinceUnpluggedReferenceService" >
+        </service>
     </application>
 
 </manifest>

README.md

@@ -15,12 +15,11 @@ Simple Android App for
 
 To Download the App
 
-http://forum.xda-developers.com/devdb/project/dl/?id=5724&task=get
+http://forum.xda-developers.com/devdb/project/dl/?id=7519&task=get
 
 
 Third party libraries:
 
-* aChartEngine
 * Sherlock-navigation-Drawer
 * Actionbar Sherlock
 * Android-Common (https://github.com/asksven/AndroidCommon)
@@ -33,6 +32,7 @@ http://forum.xda-developers.com/showthread.php?t=2728587
 
 
 === LICENSE ===
+
 See the LICENSE file.
 
 

res/layout/time_in_states.xml

@@ -11,7 +11,8 @@
         android:id="@+id/time_in_state_listView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="0.6" >
+        android:layout_weight="0.6"
+        android:divider="@null" >
     </ListView>
 
     <TextView

res/layout/wakelocksfragment.xml

@@ -16,7 +16,8 @@
         android:id="@+id/wakelock_data_listview1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="8dp" >
+        android:layout_marginTop="8dp"
+        android:divider="@null" >
     </ListView>
 
 </LinearLayout>

src/com/phantomLord/cpufrequtils/app/adapters/KernelWakelockAdapter.java

@@ -46,16 +46,14 @@ public View getView(int position, View arg1, ViewGroup arg2) {
 		ProgressBar progress = (ProgressBar) rowView
 				.findViewById(R.id.kernel_progress);
 
-		NativeKernelWakelock nativeWakeLock = kernelWakelocks
-				.get(position);
+		NativeKernelWakelock nativeWakeLock = kernelWakelocks.get(position);
 		String kernelWakelock = kernelWakelocks.get(position).getName();
-		mKernelWakelock.setText(kernelWakelock.substring(1,
-				kernelWakelock.length() - 1));
+		mKernelWakelock.setText(kernelWakelock);
 		WakeupInfo
 				.setText(SysUtils.secToString(nativeWakeLock.getDuration() / 1000));
 		progress.setMax(totaltime);
 		progress.setProgress((int) nativeWakeLock.getDuration() / 1000);
-		wakeUpCount.setText("x" + nativeWakeLock.getCount()
+		wakeUpCount.setText("x" + nativeWakeLock.getCount() + " "
 				+ context.getString(R.string.times));
 
 		return rowView;

src/com/phantomLord/cpufrequtils/app/adapters/TimeInStatesListAdapter.java

@@ -1,7 +1,9 @@
 package com.phantomLord.cpufrequtils.app.adapters;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
@@ -18,10 +20,12 @@
 import com.phantomLord.cpufrequtils.app.utils.SysUtils;
 import com.phantomLord.cpufrequtils.app.utils.TimeInStateReader;
 
+@SuppressLint("UseSparseArrays")
 public class TimeInStatesListAdapter extends BaseAdapter {
 
 	Context context;
 	ArrayList<CpuState> states = new ArrayList<>();
+	HashMap<Integer, Long> _states = new HashMap<Integer, Long>();
 	public long totaltime = 0;
 	TimeInStateReader statesReader;
 	LayoutInflater infalter;
@@ -32,12 +36,13 @@ public TimeInStatesListAdapter(Context context) {
 		this.context = context;
 		prefs = PreferenceManager.getDefaultSharedPreferences(context);
 		filterNonZeroVals = prefs.getBoolean(Constants.PREF_ZERO_VALS, true);
-		statesReader = new TimeInStateReader();
-		states = statesReader.getCpuStateTime(true);
+		statesReader = TimeInStateReader.TimeInStatesReader();
+		states = statesReader.getCpuStateTime(true, filterNonZeroVals);
 		totaltime = statesReader.getTotalTimeInState();
 		/*
 		 * remove zero values
 		 */
+
 		infalter = (LayoutInflater) context
 				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 	}
@@ -52,7 +57,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
 				.findViewById(R.id.progress);
 		TextView time = (TextView) rowView.findViewById(R.id.time);
 		TextView percentage = (TextView) rowView.findViewById(R.id.percentage);
-
 		if (states.get(position).getFrequency() == 0)
 			frequencyTextView.setText(context.getString(R.string.deep_sleep));
 		else
@@ -92,14 +96,15 @@ public long getItemId(int position) {
 	}
 
 	public void refresh() {
-		states = statesReader.getCpuStateTime(true);
+		states = statesReader.getCpuStateTime(true, filterNonZeroVals);
 		totaltime = statesReader.getTotalTimeInState();
 		notifyDataSetChanged();
 	}
 
 	public void saveOffsets() {
 		String data = "";
-		ArrayList<CpuState> newStates = statesReader.getCpuStateTime(true);
+		ArrayList<CpuState> newStates = statesReader.getCpuStateTime(true,
+				filterNonZeroVals);
 		for (CpuState state : newStates) {
 			data += state.getFrequency() + " " + state.getTime() + ",";
 		}
@@ -112,24 +117,22 @@ public void reset() {
 		removeOffsets();
 		saveOffsets();
 		loadPreviousStats();
-		states = statesReader.getCpuStateTime(true);
+		states = statesReader.getCpuStateTime(true, filterNonZeroVals);
 		totaltime = statesReader.getTotalTimeInState();
 		refresh();
 	}
 
 	public void loadPreviousStats() {
-		ArrayList<CpuState> newStates = new ArrayList<>();
 		String data = prefs.getString(Constants.PREF_TIS_RESET_STATS, null);
 
 		if (data.length() > 0) {
 			String[] line = data.split(",");
 			for (String str : line) {
 				String[] val = str.split(" ");
-				newStates.add(new CpuState(Integer.parseInt(val[0]), Long
-						.parseLong(val[1])));
+				_states.put(Integer.parseInt(val[0]), Long.parseLong(val[1]));
 			}
 		}
-		statesReader.setNewStates(newStates);
+		statesReader.newStates = _states;
 	}
 
 	public void removeOffsets() {

src/com/phantomLord/cpufrequtils/app/receivers/BootReceiver.java

@@ -10,10 +10,9 @@ public class BootReceiver extends BroadcastReceiver {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
+
 		if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
-			Intent mIntent = new Intent(context, BootService.class);
-			context.startService(mIntent);
+			context.startService(new Intent(context, BootService.class));
 		}
 	}
-
 }

src/com/phantomLord/cpufrequtils/app/receivers/SaveReferenceReceiver.java

@@ -0,0 +1,19 @@
+package com.phantomLord.cpufrequtils.app.receivers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.content.WakefulBroadcastReceiver;
+
+import com.phantomLord.cpufrequtils.app.services.SaveSinceUnpluggedReferenceService;
+
+public class SaveReferenceReceiver extends WakefulBroadcastReceiver {
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+		if (Intent.ACTION_POWER_DISCONNECTED.equals(intent.getAction())) {
+			context.startService(new Intent(context,
+					SaveSinceUnpluggedReferenceService.class));
+		}
+	}
+
+}

src/com/phantomLord/cpufrequtils/app/services/BootService.java

@@ -1,35 +1,32 @@
 package com.phantomLord.cpufrequtils.app.services;
 
-import android.app.Service;
+import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.IBinder;
 import android.preference.PreferenceManager;
 
 import com.phantomLord.cpufrequtils.app.utils.Constants;
 import com.phantomLord.cpufrequtils.app.utils.SysUtils;
 
-public class BootService extends Service {
+public class BootService extends IntentService {
+
 	SharedPreferences prefs;
 	Context context;
 
-	@Override
-	public IBinder onBind(Intent arg0) {
-		return null;
+	public BootService() {
+		super("Boot Service");
 	}
 
-	@SuppressWarnings("deprecation")
 	@Override
-	public void onStart(Intent intent, int startId) {
-		super.onStart(intent, startId);
+	protected void onHandleIntent(Intent intent) {
 		context = getApplicationContext();
 		prefs = PreferenceManager.getDefaultSharedPreferences(context);
 		SharedPreferences.Editor editor = prefs.edit();
 		editor.putString(Constants.PREF_TIS_RESET_STATS, null);
 		editor.commit();
 		try {
-			Thread.sleep(20000);
+			Thread.sleep(30000);
 		} catch (InterruptedException e) {
 			e.printStackTrace();
 		}

src/com/phantomLord/cpufrequtils/app/services/SaveSinceUnpluggedReferenceService.java

@@ -0,0 +1,22 @@
+package com.phantomLord.cpufrequtils.app.services;
+
+import android.app.IntentService;
+import android.content.Intent;
+import android.util.Log;
+
+import com.phantomLord.cpufrequtils.app.utils.Constants;
+
+public class SaveSinceUnpluggedReferenceService extends IntentService {
+
+	public SaveSinceUnpluggedReferenceService() {
+		super("Save Unplugged reference service");
+	}
+
+	@Override
+	protected void onHandleIntent(Intent intent) {
+		Log.d(Constants.App_Tag, "Saving Unplugged References ");
+
+		stopSelf();
+	}
+
+}