Rename preferences

app/src/main/java/com/icecream/snorlax/module/feature/capture/CapturePreferences.java

@@ -43,8 +43,8 @@ <T> Observable.Transformer<T, T> isEnabled() {
 		return observable -> observable
 			.doOnNext(t -> mPreferences.reload())
 			.filter(t -> {
-				final boolean excepted = getPreferenceDefaultValue();
-				return excepted == getPreference(excepted);
+				final boolean expected = getPreferenceDefaultValue();
+				return expected == getPreference(expected);
 			});
 	}
 

app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterPreferences.java

@@ -43,8 +43,8 @@ <T> Observable.Transformer<T, T> isEnabled() {
 		return observable -> observable
 			.doOnNext(t -> mPreferences.reload())
 			.filter(t -> {
-				final boolean excepted = getPreferenceDefaultValue();
-				return excepted == getPreference(excepted);
+				final boolean expected = getPreferenceDefaultValue();
+				return expected == getPreference(expected);
 			});
 	}
 

app/src/main/java/com/icecream/snorlax/module/feature/hatch/HatchPreferences.java

@@ -1,13 +1,29 @@
+/*
+ * Copyright (c) 2016. Pedro Diaz <igoticecream@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.icecream.snorlax.module.feature.hatch;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
 import android.content.res.Resources;
 
 import com.icecream.snorlax.R;
 import com.icecream.snorlax.module.context.snorlax.Snorlax;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import de.robv.android.xposed.XSharedPreferences;
 import rx.Observable;
 
@@ -27,8 +43,8 @@ <T> Observable.Transformer<T, T> isEnabled() {
         return observable -> observable
                 .doOnNext(t -> mPreferences.reload())
                 .filter(t -> {
-                    final boolean excepted = getPreferenceDefaultValue();
-                    return excepted == getPreference(excepted);
+                    final boolean expected = getPreferenceDefaultValue();
+                    return expected == getPreference(expected);
                 });
     }
 

app/src/main/java/com/icecream/snorlax/module/feature/mock/MockPreferences.java

@@ -40,8 +40,8 @@ final class MockPreferences {
 
 	boolean isEnabled() {
 		mPreferences.reload();
-		final boolean excepted = getPreferenceDefaultValue();
-		return excepted == getPreference(excepted);
+		final boolean expected = getPreferenceDefaultValue();
+		return expected == getPreference(expected);
 	}
 
 	private boolean getPreferenceDefaultValue() {

app/src/main/java/com/icecream/snorlax/module/feature/rename/Rename.java

@@ -42,10 +42,12 @@
 public final class Rename implements Feature, MitmListener {
 
 	private final MitmProvider mMitmProvider;
+	private final RenamePreferences mRenamePreferences;
 
 	@Inject
-	Rename(MitmProvider mitmProvider) {
+	Rename(MitmProvider mitmProvider, RenamePreferences renamePreferences) {
 		mMitmProvider = mitmProvider;
+		mRenamePreferences = renamePreferences;
 	}
 
 	@Override
@@ -61,6 +63,10 @@ public void unsubscribe() {
 
 	@Override
 	public ResponseEnvelope onMitm(List<Request> requests, ResponseEnvelope envelope) {
+		if (!mRenamePreferences.isEnabled()) {
+			return null;
+		}
+
 		for (int i = 0; i < requests.size(); i++) {
 			if (requests.get(i).getRequestType() == RequestType.GET_INVENTORY) {
 				try {

app/src/main/java/com/icecream/snorlax/module/feature/rename/RenamePreferences.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016. Pedro Diaz <igoticecream@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.icecream.snorlax.module.feature.rename;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import android.content.res.Resources;
+
+import com.icecream.snorlax.R;
+import com.icecream.snorlax.module.context.snorlax.Snorlax;
+
+import de.robv.android.xposed.XSharedPreferences;
+
+@Singleton
+final class RenamePreferences {
+
+	private final Resources mResources;
+	private final XSharedPreferences mPreferences;
+
+	@Inject
+	RenamePreferences(@Snorlax Resources resources, XSharedPreferences preferences) {
+		mResources = resources;
+		mPreferences = preferences;
+	}
+
+	boolean isEnabled() {
+		mPreferences.reload();
+		final boolean expected = getPreferenceDefaultValue();
+		return expected == getPreference(expected);
+	}
+
+	private boolean getPreferenceDefaultValue() {
+		return mResources.getBoolean(R.bool.preference_rename_enable);
+	}
+
+	private boolean getPreference(boolean defaultValue) {
+		return mPreferences.getBoolean(mResources.getString(R.string.preference_rename_enable_key), defaultValue);
+	}
+}

app/src/main/res/values/bools.xml

@@ -2,6 +2,7 @@
 <resources>
 	<bool name="preference_general_mock_enable">true</bool>
 	<bool name="preference_encounter_notification_enable">true</bool>
+	<bool name="preference_rename_enable">true</bool>
 	<bool name="preference_catch_notification_enable">true</bool>
 	<bool name="preference_hatch_notification_enable">true</bool>
 </resources>

app/src/main/res/values/strings.xml

@@ -39,6 +39,11 @@
 	<string name="preference_encounter_notification_enable_title">Enable encounter notifications</string>
 	<string name="preference_encounter_notification_enable_summary">Show encounter pokemons stats via system notification</string>
 
+	<string name="preference_rename">Show pokemons stats</string>
+	<string name="preference_rename_enable_key">rename_key</string>
+	<string name="preference_rename_enable_title">Enable inventory pokemons stats</string>
+	<string name="preference_rename_enable_summary">Show inventory pokemons stats on ingame pokemon list</string>
+
 	<string name="preference_catch_notification">Catch Notifications</string>
 	<string name="preference_catch_notification_enable_key">catch_notification_key</string>
 	<string name="preference_catch_notification_enable_title">Enable catch notifications</string>

app/src/main/res/xml/preferences.xml

@@ -16,6 +16,19 @@
 
 	</PreferenceCategory>
 
+	<PreferenceCategory
+		android:title="@string/preference_rename"
+		>
+
+		<SwitchPreference
+			android:defaultValue="@bool/preference_rename_enable"
+			android:key="@string/preference_rename_enable_key"
+			android:summary="@string/preference_rename_enable_summary"
+			android:title="@string/preference_rename_enable_title"
+			/>
+
+	</PreferenceCategory>
+
 	<PreferenceCategory
 		android:title="@string/preference_encounter_notification"
 		>
@@ -49,8 +62,8 @@
 		<SwitchPreference
 			android:defaultValue="@bool/preference_hatch_notification_enable"
 			android:key="@string/preference_hatch_notification_enable_key"
-			android:summary="@string/preference_hatch_notification_enable_summary"
 			android:title="@string/preference_hatch_notification_enable_title"
+			android:summary="@string/preference_hatch_notification_enable_summary"
 			/>
 
 	</PreferenceCategory>