lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/fix_scan' of ssh://git.exodus-privacy.eu.org:2225/foucry.net/PillDroid into feature/fix_scan

Browse source 
 Conflicts:
	app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
This commit is contained in:
jacques 2020-06-12 11:16:04 +02:00
commit d158094ef3
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -66,6 +66,7 @@ public class MedicamentListActivity extends AppCompatActivity {
final Boolean DBDEMO = false;
final static Random random = new Random();
public final int CUSTOMIZED_REQUEST_CODE = 0x0000ffff;
public final int SAVE_RQUEST_CODE = 0x000000ff;
@Override
public void onStart() {
@ -279,8 +280,6 @@ public class MedicamentListActivity extends AppCompatActivity {
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Log.d(TAG, "RequestCode == " + requestCode);
if (requestCode != CUSTOMIZED_REQUEST_CODE && requestCode != IntentIntegrator.REQUEST_CODE) {
// This is important, otherwise the result will not be passed to the fragment
super.onActivityResult(requestCode, resultCode, data);
@ -297,8 +296,6 @@ public class MedicamentListActivity extends AppCompatActivity {
IntentResult result = IntentIntegrator.parseActivityResult(resultCode, data);
Log.d(TAG, "result" +result);
if(result.getContents() == null) {
Intent originalIntent = result.getOriginalIntent();
if (originalIntent == null) {
@ -432,7 +429,7 @@ public class MedicamentListActivity extends AppCompatActivity {
Context context = v.getContext();
Intent intent = new Intent(context, MedicamentDetailActivity.class);
intent.putExtra("medicament", medicamentCourant);
int requestCode = 0x0000ffff;
int requestCode = 1;
startActivityForResult(intent, requestCode);
}
}