diff --git a/app/src/main/java/com/eusecom/attendance/AbsServerAsActivity.java b/app/src/main/java/com/eusecom/attendance/AbsServerAsActivity.java index ac31e77..623c9e9 100644 --- a/app/src/main/java/com/eusecom/attendance/AbsServerAsActivity.java +++ b/app/src/main/java/com/eusecom/attendance/AbsServerAsActivity.java @@ -198,7 +198,8 @@ public boolean test(String query) throws Exception { private void getAbsServer(String fromfir) { showProgressBar(); - subscription = AbsServerClient.getInstance() + String urlx = SettingsActivity.getServerName(AbsServerAsActivity.this); + subscription = AbsServerClient.getInstance(urlx) .getAbsServer(fromfir) .subscribeOn(rx.schedulers.Schedulers.io()) .observeOn(rx.android.schedulers.AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/eusecom/attendance/AbsServerAsBaseSearchActivity.java b/app/src/main/java/com/eusecom/attendance/AbsServerAsBaseSearchActivity.java index d064115..95555a6 100644 --- a/app/src/main/java/com/eusecom/attendance/AbsServerAsBaseSearchActivity.java +++ b/app/src/main/java/com/eusecom/attendance/AbsServerAsBaseSearchActivity.java @@ -225,7 +225,8 @@ private void writeKeyfToServer(String usico, String usid, String ume, String dmx DatabaseReference mDatabase, String keyf, String cplxb ) { String getfromfir = SettingsActivity.getFir(AbsServerAsBaseSearchActivity.this); - subscription = AbsServerClient.getInstance() + String urlx = SettingsActivity.getServerName(AbsServerAsBaseSearchActivity.this); + subscription = AbsServerClient.getInstance(urlx) .setKeyAndgetAbsServer(getfromfir, keyf, cplxb) .subscribeOn(rx.schedulers.Schedulers.io()) .observeOn(rx.android.schedulers.AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/eusecom/attendance/FbmessClient.java b/app/src/main/java/com/eusecom/attendance/FbmessClient.java index 8192d30..f50a730 100644 --- a/app/src/main/java/com/eusecom/attendance/FbmessClient.java +++ b/app/src/main/java/com/eusecom/attendance/FbmessClient.java @@ -25,7 +25,6 @@ public class FbmessClient { private static final String FCM_BASE_URL = "https://fcm.googleapis.com"; - private static final String GITHUB_BASE_URL = "https://api.github.com/"; private static FbmessClient instance; private FbmessService fbmessService; diff --git a/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java b/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java index ffba112..08b4a86 100644 --- a/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java +++ b/app/src/main/java/com/eusecom/attendance/fragment/ApproveListFragment.java @@ -75,13 +75,11 @@ public class ApproveListFragment extends Fragment { // [END define_database_reference] public ApproveListFragment() {} - String absxy; - String abskeydel=null; private ProgressDialog fProgressDialog; - boolean isCancelable, isrunning; + boolean isCancelable; String timestampx; - private RfEtestApi _githubService; + private RfEtestApi _rfetestService; private CompositeDisposable _disposables; private Subscription subscription; @@ -116,7 +114,7 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); String githubToken = Constants.ETEST_API_KEY; String urlx = SettingsActivity.getServerName(getActivity()); - _githubService = RfEtestService.createGithubService(githubToken, urlx); + _rfetestService = RfEtestService.createGithubService(githubToken, urlx); _disposables = new CompositeDisposable(); @@ -263,10 +261,10 @@ private void approveAbsenceToServer(String postkey, int anodaj, Attendance model String savetofir = SettingsActivity.getFir(getActivity()); String whoapprove = SettingsActivity.getUsOsc(getActivity()); - _disposables.add(_githubService.contributors(savetofir, postkey, whoapprove, approveabs_json, anodaj) + _disposables.add(_rfetestService.contributors(savetofir, postkey, whoapprove, approveabs_json, anodaj) .flatMap(Observable::fromIterable) .flatMap(contributor -> { - Observable _userObservable = _githubService.user(savetofir, postkey, whoapprove, approveabs_json, anodaj, contributor.login) + Observable _userObservable = _rfetestService.user(savetofir, postkey, whoapprove, approveabs_json, anodaj, contributor.login) .filter(user -> !isEmpty(user.name) && !isEmpty(user.email)); return Observable.zip(_userObservable, @@ -304,10 +302,10 @@ public void onNext(Pair pair) { if(contributor.saved == 1 ) { snext = getResources().getString(R.string.abs_saved) + snextx; - approveAbsenceToFB(abskeydel, contributor.anodaj, model); + approveAbsenceToFB(postkey, contributor.anodaj, model); }else{ snext = getResources().getString(R.string.abs_savednot); - approveAbsenceToFB(abskeydel, contributor.anodaj, model); + approveAbsenceToFB(postkey, contributor.anodaj, model); } @@ -336,7 +334,7 @@ private void getApproveDialog(String postkey, Attendance model) { long timestampdo = Long.parseLong(model.dado) * 1000L; String datedos = getDate(timestampdo ); - String textx = model.usname + " " + model.dmxa + " " + model.dmna + " " + dateods + " / " + datedos; + String textx = postkey + model.usname + " " + model.dmxa + " " + model.dmna + " " + dateods + " / " + datedos; TextView text = (TextView) dialog.findViewById(R.id.text); text.setText(textx); ImageView image = (ImageView) dialog.findViewById(R.id.image); @@ -349,9 +347,9 @@ private void getApproveDialog(String postkey, Attendance model) { public void onClick(View v) { dialog.dismiss(); if(savetofiri>0){ - approveAbsenceToServer(abskeydel, 1, model); + approveAbsenceToServer(postkey, 1, model); }else{ - approveAbsenceToFB(abskeydel, 1, model); + approveAbsenceToFB(postkey, 1, model); } } }); @@ -362,9 +360,9 @@ public void onClick(View v) { public void onClick(View v) { dialog.dismiss(); if(savetofiri>0){ - approveAbsenceToServer(abskeydel, 0, model); + approveAbsenceToServer(postkey, 0, model); }else{ - approveAbsenceToFB(abskeydel, 0, model); + approveAbsenceToFB(postkey, 0, model); } diff --git a/app/src/main/java/com/eusecom/attendance/retrofit/AbsServerClient.java b/app/src/main/java/com/eusecom/attendance/retrofit/AbsServerClient.java index 13c1b99..3f3a14f 100644 --- a/app/src/main/java/com/eusecom/attendance/retrofit/AbsServerClient.java +++ b/app/src/main/java/com/eusecom/attendance/retrofit/AbsServerClient.java @@ -2,6 +2,7 @@ import android.support.annotation.NonNull; +import com.eusecom.attendance.Constants; import com.eusecom.attendance.models.Attendance; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -18,14 +19,13 @@ */ public class AbsServerClient { - //https://api.github.com/users/arriolac/starred - //private static final String ABSSERVER_BASE_URL = "https://api.github.com/"; - private static final String ABSSERVER_BASE_URL = "http://www.eshoptest.sk"; private static AbsServerClient instance; private AbsServerService absServerService; - private AbsServerClient() { + private AbsServerClient(String urlx) { + + final String ABSSERVER_BASE_URL = urlx; final Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); final Retrofit retrofit = new Retrofit.Builder().baseUrl(ABSSERVER_BASE_URL) @@ -35,9 +35,9 @@ private AbsServerClient() { absServerService = retrofit.create(AbsServerService.class); } - public static AbsServerClient getInstance() { + public static AbsServerClient getInstance(String urlx) { if (instance == null) { - instance = new AbsServerClient(); + instance = new AbsServerClient(urlx); } return instance; }