add ignore nfc tag id, and moved on to 0.9.5

theScrabi · Mar 31, 2016 · b86a830 · b86a830
1 parent c8c5e1f
commit b86a830
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,9 +8,9 @@ android {
         applicationId "org.schabi.terminightor"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 6
+        versionCode 7
 
-        versionName "0.9.4"
+        versionName "0.9.5"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/org/schabi/terminightor/NightKillerActivity.java b/app/src/main/java/org/schabi/terminightor/NightKillerActivity.java
@@ -9,6 +9,7 @@
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.View;
@@ -48,6 +49,7 @@ public class NightKillerActivity extends Activity {
     private ImageView innerWave;
     private ImageView outerWave;
     private boolean hasStopped = false;
+    private boolean ignoreNfcTagId = false;
 
     private NfcAdapter nfcAdapter;
     private long alarmId = -1;
@@ -111,6 +113,9 @@ public void onCreate(Bundle savedInstanceState) {
 
         nfcAdapter = NfcAdapter.getDefaultAdapter(this);
 
+        ignoreNfcTagId = PreferenceManager.getDefaultSharedPreferences(this)
+                .getBoolean(this.getString(R.string.ignoreNfcId), false);
+
         Log.d(TAG, Long.toString(alarmId));
     }
 
@@ -145,7 +150,7 @@ public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         byte[] nfcId = intent.getByteArrayExtra(NfcAdapter.EXTRA_ID);
         if(nfcId != null) {
-            if (Arrays.equals(nfcId, expectedNfcId)) {
+            if (Arrays.equals(nfcId, expectedNfcId) || ignoreNfcTagId) {
                 Log.d(TAG, "Send kill alarm");
                 Intent killAlarmIntent = new Intent(NightKillerService.ACTION_KILL_ALARM);
                 LocalBroadcastManager.getInstance(this).sendBroadcast(killAlarmIntent);

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="use24Hours">use_24_hours</string>
     <string name="overrideAlarmVolume">override_alarm_volume</string>
+    <string name="ignoreNfcId">ignore_nfc_id</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -26,4 +26,6 @@
     <string name="unlockInfoText">Unlock screen, and enable NFC.</string>
     <string name="defaultRingTone">Default</string>
     <string name="alarmSaved">Alarm Saved</string>
+    <string name="ignoreNfcTagIdTitle">Ignore NFC tag ID</string>
+    <string name="ignoreNfcTagIdSummary">If this is set NewPipe will not check the ID of an Nfc tag, when switching an alarm off.</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
@@ -14,4 +14,10 @@
         android:summary="@string/overrideAlarmVolumeDescription"
         android:defaultValue="false"/>
 
+    <CheckBoxPreference
+        android:key="@string/ignoreNfcId"
+        android:title="@string/ignoreNfcTagIdTitle"
+        android:summary="@string/ignoreNfcTagIdSummary"
+        android:defaultValue="false"/>
+
 </PreferenceScreen>