JCE-Projects/the-social-notebook-android
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sagidayan/TheSocialNotework-Android

Browse source
This commit is contained in:
Matan Bar Yosef 2016-07-02 20:21:40 +03:00
commit c68dd0fad4
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/gradle.xml
View file

@ -5,7 +5,7 @@
<GradleProjectSettings> <GradleProjectSettings>
<option name="distributionType" value="LOCAL" /> <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" /> <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

6
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/HeavyWorker.java
View file

@ -32,12 +32,6 @@ public class HeavyWorker extends AsyncTask< String , Context , Void > {
PersonalSpaceActivity ps = (PersonalSpaceActivity)targetCtx; PersonalSpaceActivity ps = (PersonalSpaceActivity)targetCtx;
ps.getAllNotes(); ps.getAllNotes();
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
return null ; return null ;
} }

2
app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java
View file

@ -57,11 +57,13 @@ public class PersonalSpaceActivity extends AppCompatActivity {
setContentView(R.layout.activity_personal_space); setContentView(R.layout.activity_personal_space);
Bundle b = getIntent().getExtras(); Bundle b = getIntent().getExtras();
userId = b.getString("user_id"); userId = b.getString("user_id");
Log.d(TAG,"-------------------------USER ID: "+ userId);
this.locationPermission = true; this.locationPermission = true;
//check for permission //check for permission
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM); ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, FINE_PERM);
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.INTERNET}, FINE_PERM);
this.noteList = (ListView) findViewById(R.id.ps_list_listview); this.noteList = (ListView) findViewById(R.id.ps_list_listview);