mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-09 23:41:08 +01:00
Compare commits
2 commits
06e879a9ae
...
d47a030f83
Author | SHA1 | Date | |
---|---|---|---|
|
d47a030f83 | ||
|
1c39b64339 |
3 changed files with 8 additions and 2 deletions
|
@ -93,7 +93,7 @@ public class CustomScannerActivity extends AppCompatActivity implements Decorate
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onSaveInstanceState(Bundle outState) {
|
protected void onSaveInstanceState(@NonNull Bundle outState) {
|
||||||
super.onSaveInstanceState(outState);
|
super.onSaveInstanceState(outState);
|
||||||
capture.onSaveInstanceState(outState);
|
capture.onSaveInstanceState(outState);
|
||||||
}
|
}
|
||||||
|
@ -140,6 +140,7 @@ public class CustomScannerActivity extends AppCompatActivity implements Decorate
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
|
||||||
|
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
capture.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
capture.onRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -794,9 +794,13 @@ public class DrugListActivity extends AppCompatActivity {
|
||||||
// });
|
// });
|
||||||
|
|
||||||
Button btn_export = findViewById(R.id.switch_btn_export);
|
Button btn_export = findViewById(R.id.switch_btn_export);
|
||||||
|
assert btn_export != null;
|
||||||
Button btn_import = findViewById(R.id.switch_btn_import);
|
Button btn_import = findViewById(R.id.switch_btn_import);
|
||||||
|
assert btn_import != null;
|
||||||
Button btn_properties = findViewById(R.id.btn_properties);
|
Button btn_properties = findViewById(R.id.btn_properties);
|
||||||
|
assert btn_properties != null;
|
||||||
Button btn_backupLocation = findViewById(R.id.btn_backup_location);
|
Button btn_backupLocation = findViewById(R.id.btn_backup_location);
|
||||||
|
assert btn_backupLocation != null;
|
||||||
|
|
||||||
encryptBackup = sharedPreferences.getBoolean(spEncryptBackup, true);
|
encryptBackup = sharedPreferences.getBoolean(spEncryptBackup, true);
|
||||||
storageLocation = sharedPreferences.getInt(spStorageLocation, 1);
|
storageLocation = sharedPreferences.getInt(spStorageLocation, 1);
|
||||||
|
@ -868,7 +872,7 @@ public class DrugListActivity extends AppCompatActivity {
|
||||||
|
|
||||||
Log.i(TAG, "ok button");
|
Log.i(TAG, "ok button");
|
||||||
|
|
||||||
PrescriptionDatabase prescriptions = PrescriptionDatabase.getInstanceDatabase(this);
|
PrescriptionDatabase.getInstanceDatabase(this);
|
||||||
final RoomBackup roomBackup = new RoomBackup(DrugListActivity.this);
|
final RoomBackup roomBackup = new RoomBackup(DrugListActivity.this);
|
||||||
if (btn_export.isEnabled()) {
|
if (btn_export.isEnabled()) {
|
||||||
btn_export.setOnClickListener(v -> {
|
btn_export.setOnClickListener(v -> {
|
||||||
|
|
|
@ -15,5 +15,6 @@ android.enableJetifier=false
|
||||||
android.nonFinalResIds=true
|
android.nonFinalResIds=true
|
||||||
android.nonTransitiveRClass=false
|
android.nonTransitiveRClass=false
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
|
org.gradle.configuration-cache=true
|
||||||
org.gradle.jvmargs=-Xmx2048M
|
org.gradle.jvmargs=-Xmx2048M
|
||||||
org.gradle.warning.mode=none
|
org.gradle.warning.mode=none
|
||||||
|
|
Loading…
Reference in a new issue