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.

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

Add support for uploading exact BTS GPS locations draft #645

Closed
wants to merge 4 commits into from
Closed

Add support for uploading exact BTS GPS locations draft #645

wants to merge 4 commits into from

Conversation

ziem
Copy link
Contributor

@ziem ziem commented Nov 19, 2015

#590 This pull request contains:

  • adding markers to map (long press)
  • dragging (long press + move)
  • click

I also created empty methods: loadUserDefinedCoordinates, saveUserDefinedCoordinates and updateUserDefinedCoordinates. Second and third method is invoked in right place so you can fill them with database operations and everything should work.

@agilob
Copy link
Contributor

agilob commented Nov 19, 2015

So I can manually change location of cells and mess up their database? Most people will use it for that purpose. We know that, right?

@SecUpwN
Copy link
Member

SecUpwN commented Nov 19, 2015

Thanks for your PR @ziem, please investigate the conflicts? Did you update your fork prior crafting this?

@ziem
Copy link
Contributor Author

ziem commented Nov 19, 2015

Fork synced. Is there anything else I need to do?

@SecUpwN
Copy link
Member

SecUpwN commented Nov 19, 2015

Do you see the commands when pressing Use the command line? Please try that to update your PR.

@ziem
Copy link
Contributor Author

ziem commented Nov 19, 2015

I updated my PR. Above you can see my last commit:

Fork sync

@SecUpwN
Copy link
Member

SecUpwN commented Nov 20, 2015

@smarek, would you help @ziem resolving the merge conflicts, please?

@smarek
Copy link
Member

smarek commented Nov 20, 2015

@SecUpwN Since it's draft, how do you want to merge it? Because either we are interested in the feature allowing users to spoil the OCID database, we heavily rely on, and in that case we can use the feature branch to test it and merge it when it's complete feature (not a draft), or we don't want this feature, and I see no point in merging it.

@ziem sorry, you have to rebase your feature commits on top of current development branch state, not include all the changes between your development and current state within PR.
Do some reading here: https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request

And my personal insight is that you could go with git rebase origin/development (if origin is this repository), but do some back ups first and be prepared to solve the merge conflicts.

Maybe most easy, non-git, way to do it correctly, would be for you to copy&paste your code from https://github.com/ziem/Android-IMSI-Catcher-Detector/commit/b47589acdc779098127cec5f95d77cbe36fda4fa having opened latest development branch and create this PR again when your changes will be on top in git log

@ghost
Copy link

ghost commented Nov 20, 2015

I don't know if this is off topic but you could put a filter to only log a BTS if the signal equal MAX rssi/dbm value this way you know its at least close to the BTS, or before upload parse the data to make sure the rssi is max value and only add to the csv file if value is max.

We keep logging the BTS as normal but if the rssi > than the rssi stored in the database then update previous record with new gps coors & new rssi level if they are valid.

You won't need to use this option then for adding personal markers which is not a good idea as @AglioB has said and would only take one person maybe an IMSIC group to mess up the OCID database.

@agilob
Copy link
Contributor

agilob commented Nov 20, 2015

@smarek or create new branch from current origin/master and git patch using this https://patch-diff.githubusercontent.com/raw/SecUpwN/Android-IMSI-Catcher-Detector/pull/645.patch, I do it most often, it's faster and don't have to merge conflicts o/

@smarek
Copy link
Member

smarek commented Nov 20, 2015

@agilob since the file was touched with 75b6e40 which is not on master yet, i don't think that'll work nicely as PR against development

@banjaxbanjo good point 👍

@ziem
Copy link
Contributor Author

ziem commented Nov 20, 2015

@smarek I won't be able to continue working on this feature. I created pull request upon @SecUpwN's request with everything (not too much) I did few weeks ago. Feel free to close this PR if you find it unneeded.

@SecUpwN
Copy link
Member

SecUpwN commented Nov 20, 2015

@ziem, I hope you don't get discourage because of this stuff here. Should we close it, @smarek?

@smarek
Copy link
Member

smarek commented Nov 22, 2015

@SecUpwN depends on how the discussion on #590 will turn out, if we really want this feature, I'll rebase it and propose in my own PR finished (this is really just a draft)

@SecUpwN SecUpwN closed this Dec 9, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants