13 * |
13 * |
14 * Description: Implementation of class CUserAgent. |
14 * Description: Implementation of class CUserAgent. |
15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
|
18 |
18 // INCLUDE FILES |
19 // INCLUDE FILES |
19 #include <e32std.h> |
20 #include <e32std.h> |
20 #include <f32file.h> |
21 #include <f32file.h> |
21 #include <eikenv.h> |
22 #include <eikenv.h> |
22 |
23 |
23 #include <browser_platform_variant.hrh> |
24 #include <Browser_platform_variant.hrh> |
24 #include "webUtilsCommon.h" |
25 #include "webUtilsCommon.h" |
25 #include <cuseragent.h> |
26 #include "CUserAgent.h" |
26 #include "WebUtilsLogger.h" |
27 #include "WebUtilsLogger.h" |
27 |
28 |
28 #include <webutilsinternalcrkeys.h> |
29 #include "WebUtilsInternalCRKeys.h" |
|
30 |
29 |
31 |
30 #define KPlaceHolderMozillaVer _L("Mozilla/5.0") |
32 #define KPlaceHolderMozillaVer _L("Mozilla/5.0") |
31 #define KPlaceHolderComponent _L("AppleWebKit/525 (KHTML, like Gecko) Version/3.0") |
33 #define KPlaceHolderComponent _L("AppleWebKit/525 (KHTML, like Gecko) Version/3.0") |
32 #define KPlaceHolderBrowserName _L("BrowserNG") |
34 #define KPlaceHolderBrowserName _L("BrowserNG") |
33 |
35 |
688 { |
690 { |
689 |
691 |
690 TInt ret(0); |
692 TInt ret(0); |
691 TBuf<64> BrowserVersionMajor(0); |
693 TBuf<64> BrowserVersionMajor(0); |
692 TBuf<64> BrowserVersionMinor(0); |
694 TBuf<64> BrowserVersionMinor(0); |
693 TBuf<64> BrowserVersionFeatureRev(0); |
695 TBuf<64> BrowserVersionSVNRev(0); |
694 TBuf<64> BrowserVersionPatchRev(0); |
|
695 |
696 |
696 iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength); |
697 iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength); |
697 |
698 |
698 TPtr BrowserVersionPtr = iBrowserVersionStr->Des(); |
699 TPtr BrowserVersionPtr = iBrowserVersionStr->Des(); |
699 |
700 |
700 |
701 |
701 ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor); |
702 ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor); |
702 if(ret == KErrNone) |
703 if(ret == KErrNone) |
703 { |
704 { |
704 ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor); |
705 ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor); |
705 if(ret == KErrNone) |
706 if(ret == KErrNone) |
706 { |
707 { |
707 ret = iRepository->Get(KWebUtilsBrowserVersionFeatureRev, BrowserVersionFeatureRev); |
708 ret = iRepository->Get(KWebUtilsBrowserVersionSVNRev, BrowserVersionSVNRev); |
708 if(ret == KErrNone) |
709 if(ret == KErrNone) |
709 { |
710 { |
710 ret = iRepository->Get(KWebUtilsBrowserVersionPatchRev, BrowserVersionPatchRev); |
711 BrowserVersionPtr.Append(BrowserVersionMajor); |
711 if(ret == KErrNone) |
712 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
712 { |
713 BrowserVersionPtr.Append(BrowserVersionMinor); |
713 BrowserVersionPtr.Append(BrowserVersionMajor); |
714 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
714 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
715 BrowserVersionPtr.Append(BrowserVersionSVNRev); ; |
715 BrowserVersionPtr.Append(BrowserVersionMinor); |
716 } |
716 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
717 } |
717 BrowserVersionPtr.Append(BrowserVersionFeatureRev); |
718 } |
718 //Incase of Feature releases we do not show Patch number. |
|
719 //Therefore, if the patch version is 0 or empty then we do not show the content |
|
720 if( (BrowserVersionPatchRev.CompareF(_L("0")) == 0) |
|
721 || (BrowserVersionPatchRev.CompareF(KNullDesC) == 0)) |
|
722 { |
|
723 //Do Nothing |
|
724 } |
|
725 else |
|
726 { |
|
727 BrowserVersionPtr.Append(KPlaceHolderPeriod); |
|
728 BrowserVersionPtr.Append(BrowserVersionPatchRev); |
|
729 } |
|
730 } |
|
731 } |
|
732 } |
|
733 } |
|
734 |
719 |
735 if(ret != KErrNone) |
720 if(ret != KErrNone) |
736 { |
721 { |
737 LOG_WRITE("Error: Reading default Browser Version from cenrep failed!"); |
722 LOG_WRITE("Error: Reading default Browser Version from cenrep failed!"); |
738 LOG_LEAVEFN("CUserAgent::BrowserVersion()"); |
723 LOG_LEAVEFN("CUserAgent::BrowserVersion()"); |