Compare commits

..

No commits in common. "d47a030f8380ed3806452d5a77eef8c93545ddb7" and "06e879a9ae43a8d3522ef592e23c736b5b2f1903" have entirely different histories.

3 changed files with 2 additions and 8 deletions

View file

@ -93,7 +93,7 @@ public class CustomScannerActivity extends AppCompatActivity implements Decorate
}
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
capture.onSaveInstanceState(outState);
}
@ -140,7 +140,6 @@ public class CustomScannerActivity extends AppCompatActivity implements Decorate
@Override
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
capture.onRequestPermissionsResult(requestCode, permissions, grantResults);
}

View file

@ -794,13 +794,9 @@ public class DrugListActivity extends AppCompatActivity {
// });
Button btn_export = findViewById(R.id.switch_btn_export);
assert btn_export != null;
Button btn_import = findViewById(R.id.switch_btn_import);
assert btn_import != null;
Button btn_properties = findViewById(R.id.btn_properties);
assert btn_properties != null;
Button btn_backupLocation = findViewById(R.id.btn_backup_location);
assert btn_backupLocation != null;
encryptBackup = sharedPreferences.getBoolean(spEncryptBackup, true);
storageLocation = sharedPreferences.getInt(spStorageLocation, 1);
@ -872,7 +868,7 @@ public class DrugListActivity extends AppCompatActivity {
Log.i(TAG, "ok button");
PrescriptionDatabase.getInstanceDatabase(this);
PrescriptionDatabase prescriptions = PrescriptionDatabase.getInstanceDatabase(this);
final RoomBackup roomBackup = new RoomBackup(DrugListActivity.this);
if (btn_export.isEnabled()) {
btn_export.setOnClickListener(v -> {

View file

@ -15,6 +15,5 @@ android.enableJetifier=false
android.nonFinalResIds=true
android.nonTransitiveRClass=false
android.useAndroidX=true
org.gradle.configuration-cache=true
org.gradle.jvmargs=-Xmx2048M
org.gradle.warning.mode=none