Skip to content

Commit 23f9386

Browse files
committed
API 14
1 parent 4fdfffe commit 23f9386

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

.idea/artifacts/TaxiAndroidOpen.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidManifest.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,15 @@
236236
</intent-filter>
237237
</receiver>-->
238238

239+
<receiver android:name=".NetworkStateReceiver">
240+
<intent-filter>
241+
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
242+
</intent-filter>
243+
</receiver>
244+
239245
<receiver
240246
android:name="com.google.android.gms.gcm.GcmReceiver"
247+
android:exported="true"
241248
android:permission="com.google.android.c2dm.permission.SEND">
242249
<intent-filter>
243250
<action android:name="com.google.android.c2dm.intent.RECEIVE"/>
@@ -247,12 +254,6 @@
247254
</intent-filter>
248255
</receiver>
249256

250-
<receiver android:name=".NetworkStateReceiver">
251-
<intent-filter>
252-
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
253-
</intent-filter>
254-
</receiver>
255-
256257
<service
257258
android:name=".gcm.GcmMessageHandler"
258259
android:exported="false">
@@ -268,8 +269,8 @@
268269
<action android:name="com.google.android.gms.iid.InstanceID"/>
269270
</intent-filter>
270271
</service>
271-
<service android:name=".service.CoordinatesService"/>
272-
<service android:name=".gcm.GCMRegisterService"/>
272+
<service android:exported="false" android:name=".service.CoordinatesService"/>
273+
<service android:exported="false" android:name=".gcm.GCMRegisterService"/>
273274

274275
<!--<service android:name="com.littlefluffytoys.littlefluffylocationlibrary.LocationBroadcastService"/>
275276

TaxiAndroidOpen.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
<file>file://$MODULE_DIR$/proguard-jackson-2.pro</file>
2020
<file>file://$MODULE_DIR$/proguard-acra.pro</file>
2121
<file>file://$MODULE_DIR$/proguard-eventbus.pro</file>
22+
<file>file://%MODULE_SDK_HOME%/tools/proguard/proguard-android.txt</file>
23+
<file>file://$MODULE_DIR$/proguard-project.txt</file>
2224
</proGuardCfgFiles>
2325
<option name="UPDATE_PROPERTY_FILES" value="true" />
2426
<option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />

src/com/opentaxi/android/MainActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import android.widget.Button;
3131
import android.widget.FrameLayout;
3232
import android.widget.TextView;
33-
import com.facebook.AccessToken;
3433
import com.facebook.login.LoginManager;
3534
import com.getbase.floatingactionbutton.FloatingActionButton;
3635
import com.google.android.gms.common.ConnectionResult;
@@ -49,7 +48,6 @@
4948
import com.opentaxi.models.CoordinatesLight;
5049
import com.opentaxi.models.MapRequest;
5150
import com.opentaxi.models.NewCRequestDetails;
52-
import com.opentaxi.models.Users;
5351
import com.opentaxi.rest.RestClient;
5452
import com.stil.generated.mysql.tables.pojos.Cars;
5553
import com.taxibulgaria.enums.SecurityLevel;

0 commit comments

Comments
 (0)