5757import java .util .Set ;
5858
5959import static com .eveningoutpost .dexdrip .Home .startWatchUpdaterService ;
60+ import static com .eveningoutpost .dexdrip .utils .DatabaseUtil .getDataBaseSizeInBytes ;
6061import static com .eveningoutpost .dexdrip .utils .DexCollectionType .DexcomG5 ;
6162import static com .eveningoutpost .dexdrip .xdrip .gs ;
6263
@@ -80,6 +81,7 @@ public class SystemStatusFragment extends Fragment {
8081 private ActiveBluetoothDevice activeBluetoothDevice ;
8182 private static final String TAG = "SystemStatus" ;
8283 private BroadcastReceiver serviceDataReceiver ;
84+ private TextView db_size_view ;
8385
8486 //@Inject
8587 MicroStatus microStatus ;
@@ -177,6 +179,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
177179 sensor_status_view = (TextView ) v .findViewById (R .id .sensor_status );
178180 transmitter_status_view = (TextView ) v .findViewById (R .id .transmitter_status );
179181 current_device = (TextView ) v .findViewById (R .id .remembered_device );
182+ db_size_view = (TextView ) v .findViewById (R .id .db_size );
180183
181184 notes = (TextView ) v .findViewById (R .id .other_notes );
182185
@@ -238,6 +241,7 @@ private void set_current_values() {
238241 setTransmitterStatus ();
239242 setNotes ();
240243 futureDataCheck ();
244+ setDbSize ();
241245
242246 /* if (notes.getText().length()==0) {
243247 notes.setText("Swipe for more status pages!");
@@ -274,6 +278,18 @@ private void setTransmitterStatus() {
274278
275279 }
276280
281+ private void setDbSize () {
282+ long dbSizeLengthLong = getDataBaseSizeInBytes ();
283+ String dbSizeString = "0" ;
284+ if (dbSizeLengthLong > 0 ) { // If there is a database
285+ if (dbSizeLengthLong < 31457280 ) { // When smaller than 30M, round and show one decimal point
286+ dbSizeString = JoH .roundFloat ((float ) dbSizeLengthLong / (1024 * 1024 ), 1 ) + "" ;
287+ } else { // When greater than 30M, round and just show integer
288+ dbSizeString = (int ) (JoH .roundFloat ((float ) dbSizeLengthLong / (1024 * 1024 ), 0 )) + "" ;
289+ }
290+ db_size_view .setText (dbSizeString + "M" );
291+ }
292+ }
277293
278294 private void setSensorStatus () {
279295 sensor_status_view .setText (SensorStatus .status ());
@@ -285,7 +301,7 @@ private void setVersionName() {
285301 try {
286302 versionName = safeGetContext ().getPackageManager ().getPackageInfo (safeGetContext ().getPackageName (), PackageManager .GET_META_DATA ).versionName ;
287303 int versionNumber = safeGetContext ().getPackageManager ().getPackageInfo (safeGetContext ().getPackageName (), PackageManager .GET_META_DATA ).versionCode ;
288- versionName += "\n Code: " + BuildConfig .buildVersion + " \n Downgradable to: " + versionNumber ;
304+ versionName += "\n Code: " + BuildConfig .buildVersion ;
289305 version_name_view .setText (versionName );
290306 } catch (PackageManager .NameNotFoundException e ) {
291307 //e.printStackTrace();
0 commit comments