Bladeren bron

Separated BroadcastReceiver SMS MMS CALL
Delete Log.Debug
Add icon launcher in manifest

sylvrec 9 jaren geleden
bovenliggende
commit
7b6d57e3fd

+ 1 - 0
app/app.iml

@@ -96,6 +96,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />

+ 12 - 2
app/src/main/AndroidManifest.xml

@@ -2,12 +2,13 @@
     package="com.sylvrec.incallsms">
     <uses-permission android:name="android.permission.RECEIVE_SMS"/>
     <uses-permission android:name="android.permission.RECEIVE_MMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_WAP_PUSH"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-feature android:name="android.hardware.camera" />
 
-    <application android:name=".MyApp">
+    <application android:name=".MyApp" android:icon="@mipmap/ic_launcher">
 
         <activity android:name=".MainActivity" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:logo="@mipmap/ic_launcher" android:theme="@style/AppTheme" >
             <intent-filter>
@@ -19,8 +20,17 @@
         <receiver android:name=".IncomingCallReceiver">
             <intent-filter android:priority="1000">
                 <action android:name="android.intent.action.PHONE_STATE"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".IncomingSmsReceiver">
+            <intent-filter android:priority="1000">
                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
-                <action android:name="android.provider.Telephony.MMS_RECEIVED"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".IncomingMmsReceiver">
+            <intent-filter android:priority="1000">
+                <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
+                <data android:mimeType="application/vnd.wap.mms-message" />
             </intent-filter>
         </receiver>
     </application>

+ 0 - 6
app/src/main/java/com/sylvrec/incallsms/IncomingCallReceiver.java

@@ -23,11 +23,5 @@ public class IncomingCallReceiver extends BroadcastReceiver {
         if (state.equals(TelephonyManager.EXTRA_STATE_RINGING) && _settings.Read().getBoolean(Settings.ID.STATECALL, false)) {
             new FlashLight().Blink(_settings.Read().getInt(Settings.ID.STARRATECALL, 0), 500);
         }
-        if (intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED") && _settings.Read().getBoolean(Settings.ID.STATESMS, false)) {
-            new FlashLight().Blink(_settings.Read().getInt(Settings.ID.STARRATESMS, 0), 500);
-        }
-        if (intent.getAction().equals("android.provider.Telephony.WAP_PUSH_RECEIVED") && _settings.Read().getBoolean(Settings.ID.STATEMMS, false)) {
-            new FlashLight().Blink(_settings.Read().getInt(Settings.ID.STARRATEMMS, 0), 500);
-        }
     }
 }

+ 20 - 0
app/src/main/java/com/sylvrec/incallsms/IncomingMmsReceiver.java

@@ -0,0 +1,20 @@
+package com.sylvrec.incallsms;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Created by sylvr on 10/2/2016.
+ */
+
+public class IncomingMmsReceiver extends BroadcastReceiver {
+    private Settings _settings;
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        _settings = Settings.GetInstance(context);
+        if (intent.getAction().equals("android.provider.Telephony.WAP_PUSH_RECEIVED") && _settings.Read().getBoolean(Settings.ID.STATEMMS, false)) {
+            new FlashLight().Blink(_settings.Read().getInt(Settings.ID.STARRATEMMS, 0), 500);
+        }
+    }
+}

+ 22 - 0
app/src/main/java/com/sylvrec/incallsms/IncomingSmsReceiver.java

@@ -0,0 +1,22 @@
+package com.sylvrec.incallsms;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * Created by sylvr on 10/2/2016.
+ */
+
+public class IncomingSmsReceiver extends BroadcastReceiver {
+    private Settings _settings;
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        _settings = Settings.GetInstance(context);
+        if (intent.getAction().equals("android.provider.Telephony.SMS_RECEIVED") && _settings.Read().getBoolean(Settings.ID.STATESMS, false)) {
+            new FlashLight().Blink(_settings.Read().getInt(Settings.ID.STARRATESMS, 0), 500);
+        }
+    }
+}

+ 0 - 1
app/src/main/java/com/sylvrec/incallsms/UI/StarRateView.java

@@ -58,7 +58,6 @@ public class StarRateView extends LinearLayout implements View.OnClickListener {
 
     @Override
     public void onClick(View v) {
-        Log.d("TEST", "TEST COMMENT FUCKING GOD");
         switch (v.getId()){
             case R.id.star_0:
                 ChangeStateBtnStar(1);