diff --git a/app/build.gradle b/app/build.gradle index f05b562..8595f6b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { compileSdk 34 targetSdkVersion 34 multiDexEnabled true - versionCode 31 - versionName "4.5.0" + versionCode 38 + versionName "4.5.7" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' buildFeatures.dataBinding = true vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/database/HistoryItem.java b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/database/HistoryItem.java index 151e1fc..88677a6 100644 --- a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/database/HistoryItem.java +++ b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/database/HistoryItem.java @@ -4,6 +4,7 @@ import android.os.Parcel; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.room.Entity; import androidx.room.Ignore; import androidx.room.PrimaryKey; @@ -28,6 +29,7 @@ public class HistoryItem { private Bitmap image; @NonNull private String text = ""; + @Nullable private byte[] rawBytes; private int numBits; private ResultPoint[] resultPoints; diff --git a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/activities/generator/TelEnterActivity.java b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/activities/generator/TelEnterActivity.java index bb25cbb..63c8fe8 100644 --- a/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/activities/generator/TelEnterActivity.java +++ b/app/src/main/java/com/secuso/privacyfriendlycodescanner/qrscanner/ui/activities/generator/TelEnterActivity.java @@ -20,8 +20,6 @@ public class TelEnterActivity extends AppCompatActivity { - private static final int REQUEST_SELECT_PHONE = 1; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -55,43 +53,5 @@ public void onClick(View v) { } }); - - findViewById(R.id.selectContactButton).setOnClickListener(view -> selectPhoneNumber()); - - } - - private void selectPhoneNumber() { - Intent intent = new Intent(Intent.ACTION_PICK); - intent.setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE); - if (intent.resolveActivity(getPackageManager()) != null) { - startActivityForResult(intent, REQUEST_SELECT_PHONE); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == REQUEST_SELECT_PHONE && resultCode == RESULT_OK) { - Uri contactUri = data.getData(); - String[] projection = - { - ContactsContract.CommonDataKinds.Phone._ID, - ContactsContract.CommonDataKinds.Phone.NUMBER, - ContactsContract.CommonDataKinds.Phone.TYPE, - ContactsContract.CommonDataKinds.Phone.LABEL - }; - try { - Cursor cursor = getContentResolver().query(contactUri, projection, null, null, null); - if (cursor.moveToFirst()) { - int phoneNoIdx = cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER); - String phoneNo = cursor.getString(phoneNoIdx); - ((EditText) findViewById(R.id.editPhone)).setText(phoneNo); - } - cursor.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } } } diff --git a/app/src/main/res/layout/activity_tel_enter.xml b/app/src/main/res/layout/activity_tel_enter.xml index 0f54e8b..2f98e68 100644 --- a/app/src/main/res/layout/activity_tel_enter.xml +++ b/app/src/main/res/layout/activity_tel_enter.xml @@ -39,19 +39,6 @@ android:minHeight="48dp" /> -