Fix crash + Remove unused imports

po-devs · Dec 4, 2015 · bcfd94f · bcfd94f
1 parent 5dc075d
commit bcfd94f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/project.properties b/project.properties
@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=android-20
+target=android-22
 +android.library.reference.2=google-play-services_lib
 android.library.reference.1=viewpagerindicator/library
 
diff --git a/src/com/podevs/android/poAndroid/NetworkService.java b/src/com/podevs/android/poAndroid/NetworkService.java
@@ -809,13 +809,9 @@ else if(t.level > prevTier.level) { // Child case
 							Pattern myName = Pattern.compile("(?<!\\S)(" + this.me.nick.toLowerCase() + ")(?!\\w)");
 							Matcher myMatcher = myName.matcher(message.toString().toLowerCase());
 							if (myMatcher.find()) {
-								int left = ((String) message).toLowerCase().indexOf(this.me.nick.toLowerCase());
-								left = left + name.length() + (chatSettings.timeStamp ? 13 : 2);
-								if (playerAuth(pId) > 0 && playerAuth(pId) < 4) {
-									left = left + 1;
-								}
-								int right = this.me.nick.length() + left;
 								message = Html.fromHtml(beg + StringUtilities.escapeHtml((String) message));
+								int left = (String.valueOf(message)).toLowerCase().indexOf(this.me.nick.toLowerCase());
+								int right = this.me.nick.length() + left;
 								if (!hasChannel) {
 									// Broadcast message
 									if (chatActivity != null && message.toString().contains("Wrong password for this name.")) // XXX Is this still the message sent?

diff --git a/src/com/podevs/android/poAndroid/registry/CustomExceptionHandler.java b/src/com/podevs/android/poAndroid/registry/CustomExceptionHandler.java
@@ -7,20 +7,12 @@
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.Toast;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.HTTP;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.InputStreamReader;
 import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Custom Unhandled exception handler.
@@ -195,6 +187,7 @@ public void run() {
      * @param info Array of info
      */
 
+    /*
     private void upload(final String[] info) {
         final List<NameValuePair> list = new ArrayList<NameValuePair>();
         list.add(new BasicNameValuePair("time", info[0]));
@@ -222,6 +215,7 @@ public void run() {
             }
         }.start();
     }
+    */
 
     /**
      * Writes info to file. Filename = POError" +info[0].replace(" ", "@").replace(":", ".") + ".txt"

diff --git a/src/com/podevs/android/poAndroid/teambuilder/EditPokemonActivity.java b/src/com/podevs/android/poAndroid/teambuilder/EditPokemonActivity.java
@@ -2,8 +2,6 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
 import android.support.v4.app.FragmentActivity;
 import com.podevs.android.poAndroid.R;
 import com.podevs.android.poAndroid.poke.TeamPoke;