v. 1.0.40

.gitignore

@@ -19,7 +19,7 @@ out/
 build/
 
 # Local configuration file (sdk path, etc)
-#local.properties
+local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -43,3 +43,4 @@ captures/
 
 target/
 gen-external-apklibs/
+doc/

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.opentaxi.android"
-          android:versionName="1.0.38"
-          android:versionCode="38"
+          android:versionName="1.0.40"
+          android:versionCode="40"
           android:installLocation="auto">
 
     <uses-sdk

proguard.cfg

@@ -46,6 +46,10 @@
 -keep class com.stil.** { *; }
 -keep interface com.stil.** { *; }
 
+## pojos models
+-keep class com.taxibulgaria.** { *; }
+-keep interface com.taxibulgaria.** { *; }
+
 ### apache http client for android
 -dontwarn org.apache.commons.**
 -keep class org.apache.http.** { *; }
@@ -89,3 +93,6 @@
 ### JSON
 #-keep class org.json.** { *; }
 #-keep interface org.json.** { *; }
+
+##GSON
+# -keep class sun.misc.Unsafe

src/com/opentaxi/android/MainActivity.java

@@ -627,7 +627,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         }
     }*/
 
-    @UiThread
+    /*@UiThread
     public void createNotification() {
         // Prepare intent which is triggered if the
         // notification is selected
@@ -649,7 +649,7 @@ public void createNotification() {
         noti.defaults |= Notification.DEFAULT_VIBRATE;
 
         notificationManager.notify(0, noti);
-    }
+    }*/
 
     private void doObtainedLocation(Location location) {
         try {

src/com/opentaxi/android/fragments/NewClientFragment.java

@@ -125,7 +125,7 @@ void sendButton() {
 
     @FocusChange({R.id.userNameField})
     void focusChangedOnUserNameField(View userField, boolean hasFocus) {
-        if (!hasFocus) {
+        if (!hasFocus && userName!=null) {
             userName.setError(null);
             checkUsername(userName.getText().toString());
         }