Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Influx3 and4 g #6

Merged
merged 9 commits into from
Apr 25, 2024
Merged

Influx3 and4 g #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6ec35a
fix crash when no subscription present
PeterHasse Apr 18, 2024
0355045
fix racecondition on startup
PeterHasse Apr 18, 2024
1b1dc90
ask android to keep the screen on while omnt is in front
PeterHasse Apr 18, 2024
862e06d
handle missing CI. This needs more thoughts in the future
PeterHasse Apr 18, 2024
a8521b5
add missing CP check
PeterHasse Apr 18, 2024
12ecc91
added setting to disable neighbourcells on homescreen
PeterHasse Apr 18, 2024
b390693
fix bug where logging could not be restarted, fix logo in menubar not…
PeterHasse Apr 19, 2024
8a8234c
remove unused parameter
PeterHasse Apr 25, 2024
1475e7a
Merge branch 'main' into influx3And4G
PeterHasse Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 127 additions & 0 deletions OpenMNT_logo_no_title.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 15 additions & 7 deletions ...src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/DataProvider/DataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,9 @@ public void onCellInfoChanged(@NonNull List<CellInfo> list) {
cim.setSsrsrq(ssNR.getSsRsrq());
cim.setSssinr(ssNR.getSsSinr());
cim.setAsuLevel(ssNR.getAsuLevel());
cim.setTimingAdvance(ssNR.getTimingAdvanceMicros());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
cim.setTimingAdvance(ssNR.getTimingAdvanceMicros());
}
}
if (ci instanceof CellInfoLte) {
CellInfoLte ciLTE = (CellInfoLte) ci;
Expand Down Expand Up @@ -408,8 +410,10 @@ public List<Point> getCellInformationPoint() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
point.addField("Bands", ci_.getBands());
}
point.addField("CI", ci_.getCi());
point.addTag("CI", String.valueOf(ci_.getCi()));
long ci = ci_.getCi();
if (ci != CellInfo.UNAVAILABLE) {
point.addTag("CI", String.valueOf(ci));
}
point.addField("NRARFCN", ci_.getARFCN());
point.addField("MNC", ci_.getMnc());
point.addField("MCC", ci_.getMcc());
Expand All @@ -430,8 +434,10 @@ public List<Point> getCellInformationPoint() {
point.addField("Bands", ci_.getBands());
}
point.addField("Bandwidth", ci_.getBandwidth());
point.addField("CI", ci_.getCi());
point.addTag("CI", String.valueOf(ci_.getCi()));
long ci = ci_.getCi();
if (ci != CellInfo.UNAVAILABLE) {
point.addTag("CI", String.valueOf(ci_.getCi()));
}
point.addField("ARFCN", ci_.getARFCN());
point.addField("MNC", ci_.getMnc());
point.addField("MCC", ci_.getMcc());
Expand All @@ -452,8 +458,10 @@ public List<Point> getCellInformationPoint() {
}
if (Objects.equals(ci_.getCellType(), "GSM")) {
point.addField("CellType", "GSM");
point.addField("CI", ci_.getCi());
point.addTag("CI", String.valueOf(ci_.getCi()));
long ci = ci_.getCi();
if (ci != CellInfo.UNAVAILABLE) {
point.addTag("CI", String.valueOf(ci_.getCi()));
}
point.addField("ARFCN", ci_.getARFCN());
point.addField("MNC", ci_.getMnc());
point.addField("MCC", ci_.getMcc());
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/GlobalVars.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.widget.ImageView;

import de.fraunhofer.fokus.OpenMobileNetworkToolkit.DataProvider.DataProvider;

Expand Down Expand Up @@ -45,6 +46,15 @@ public class GlobalVars {
private boolean feature_work_profile;
private boolean permission_phone_state;

public ImageView getLog_status() {
return log_status;
}

public void setLog_status(ImageView log_status) {
this.log_status = log_status;
}

ImageView log_status;
private GlobalVars(){}

public static synchronized GlobalVars getInstance(){
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/de/fraunhofer/fokus/OpenMobileNetworkToolkit/HomeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import androidx.cardview.widget.CardView;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

import java.security.MessageDigest;
Expand Down Expand Up @@ -427,6 +428,10 @@ private CardView get_cell_card_view(){
List<CellInformation> cil = dp.getCellInformation();
int cell = 1;
for (CellInformation ci : cil) {
if ( !PreferenceManager.getDefaultSharedPreferences(context).getBoolean("show_neighbour_cells", false) && ! ci.isRegistered()) {
continue;
}

TableRow title = rowBuilder("Cell " + cell, "");
if (cell > 1) {
title.setPadding(0,20,0,0);
Expand Down
Loading
Loading